diff --git a/helpers/make-openssh b/helpers/make-openssh
index e914e1ad..b9baf347 100644
--- a/helpers/make-openssh
+++ b/helpers/make-openssh
@@ -17,20 +17,19 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=9
+VERSION=10
 NETINST=true
 
 . ./config
 
 #FIXME:T12
 # Set version number due to source origin change
-export FULLVERSION="$(sed 's|ubuntu0.13||' <<< $FULLVERSION)"
+FULLVERSION="$(sed -E 's/^(.*)ubuntu([^+]+)(\+.*)$/\1\3~ubuntu\2/' <<< $FULLVERSION)"
 
 sed 's:Ubuntu:Trisquel\ GNU/Linux:g' -i debian/rules
 sed "s|^SSH_EXTRAVERSION.*|SSH_EXTRAVERSION := Trisquel_GNU/Linux_$REVISION-$VERSION|" -i debian/rules
 
 changelog "Rebranded for Trisquel"
-head -n1 debian/changelog | grep -q ubuntu && echo "error: update upstream version" && exit
 
 package