diff --git a/helpers/make-ubiquity b/helpers/make-ubiquity
index 90b56b128729ff39d6d7f28d59ad7891fcd8d323..2338996932f4a1bd6b68cdaba43a25520af0f59d 100644
--- a/helpers/make-ubiquity
+++ b/helpers/make-ubiquity
@@ -17,7 +17,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=2
+VERSION=5
 
 . ./config
 
@@ -33,6 +33,9 @@ export DEB_BUILD_OPTIONS=nocheck
 # Fix update issues on clean installations: http://trisquel.info/es/forum/update-issues-clean-install
 sed 's:\(targetdb)\):\1\n        os.system("sudo chmod 644 /target/var/cache/debconf/config.dat"):' bin/ubiquity -i
 
+# Fix https://bugs.launchpad.net/ubuntu/+source/ubiquity/+bug/1080701
+sed '/from ubiquity import osextras/s/$/\nos.system("sudo swapoff -a")/' bin/ubiquity-wrapper -i
+
 for i in $(ls -1 d-i/source/apt-setup/generators |grep -v 01setup) canonical.com security.ubuntu.com extras.ubuntu.com
 do
     /bin/sed /$i/d -i debian/ubiquity.install-any d-i/source/apt-setup/debian/*.install