diff --git a/helpers/make-linux b/helpers/make-linux
index 0c42877269411beb82c8acf871b9c4ea5f9eef15..b1d7666f02118f9f138f97590dbb691e39f5dc64 100644
--- a/helpers/make-linux
+++ b/helpers/make-linux
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#    Copyright (C) 2008-2013  Rubén Rodríguez <ruben@trisquel.info>
+#    Copyright (C) 2008-2015  Rubén Rodríguez <ruben@trisquel.info>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -43,7 +43,11 @@ sed s/family=ubuntu/family=trisquel/ -i debian/rules.d/0-common-vars.mk
 
 rename s/ubuntu/trisquel/ debian.*/config/config.common.ubuntu 
 
-sed 's/Linux/Linux-libre/g' debian/control debian/control.stub -i
+#sed 's/Linux/Linux-libre/g' debian/control debian/control.stub -i
+find debian* -type f -name *control* -exec sed 's/ with Ubuntu patches//; s/Linux/Linux-libre/g' -i {} \;
+
+# Descriptions should not change based on the build arch
+sed 's/on DESC//; s/PKGVER on/PKGVER/; /^ DESC.$/d;' debian*/control.d/flavour-control.stub -i
 
 sed '/^firmware/d' ./debian*/abi/*/fwinfo -i
 echo > ./debian.master/d-i/firmware/nic-modules