diff --git a/helpers/make-expat b/helpers/make-expat
index 711f5341..4ed5023c 100644
--- a/helpers/make-expat
+++ b/helpers/make-expat
@@ -23,15 +23,14 @@
 # such packages from Debian in order to build the required udeb packages.
 ##
 
-VERSION=5
+VERSION=6
 NETINST=true
 . ./config
 
 #FIXME:T12
 # Set version number due to source origin change
-export FULLVERSION="$(sed 's|ubuntu0.6||' <<< $FULLVERSION)"
+export FULLVERSION="$(sed -E 's/^(.*)ubuntu([^+]+)(\+.*)$/\1\3~ubuntu\2/' <<< $FULLVERSION)"
 
 changelog "Fetch and build as udeb dependency for debian-installer."
-head -n1 debian/changelog | grep -q ubuntu && echo "> error: update upstream version" && exit
 
 package