diff --git a/helpers/make-openssh b/helpers/make-openssh
index 2ea37ebaeadd4c1fd51208359084a9dfbbc4117d..68131f6309770b4ff9b494db2b4ebfdf15d7cb68 100644
--- a/helpers/make-openssh
+++ b/helpers/make-openssh
@@ -17,15 +17,20 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=2
+VERSION=3
 NETINST=true
 
 . ./config
 
+#FIXME:T12
+# Set version number due to source origin change
+export FULLVERSION="$(sed 's|ubuntu0.4||' <<< $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