diff --git a/helpers/make-linux b/helpers/make-linux
index bac9e309d89adaf36067faa7bf60fece56260fa1..ae3f62065aaf206042ffb17a0f440bb80569c9cc 100644
--- a/helpers/make-linux
+++ b/helpers/make-linux
@@ -1,6 +1,7 @@
 #!/bin/sh
 #
 #    Copyright (C) 2008-2018  Ruben Rodriguez <ruben@trisquel.info>
+#    Copyright (C) 2019 David Trudgian <dave@trudgian.net>
 #
 #    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
@@ -17,7 +18,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=3
+VERSION=4
 
 . ./config
 
@@ -38,6 +39,10 @@ sh $DATA/deblob-4.15 --force
 echo "Reverting deblobbing for files patched by silent-accept-firmware"
 cp /tmp/preserve/* . -av
 
+# Wipe dkms-versions
+# lists zfs / nvidia versions
+echo > debian/dkms-versions
+
 # Remove ZFS
 rm zfs spl debian/scripts/misc/update-zfs.sh -rf
 /bin/sed 's/spl-dkms, zfs-dkms//' -i debian/control debian.master/control.d/vars.generic debian.master/control.d/vars.*
@@ -50,6 +55,13 @@ rm ubuntu/vbox* -rf
 sed /vbox/d -i debian.master/control.d/generic.inclusion-list ubuntu/Makefile 
 sed '/vbox/d' -i debian.master/reconstruct
 
+# Remove nvidia
+rm -rf debian/scripts/debian/scripts/dkms-build--nvidia-N
+/bin/sed '/ifeq ($(do_dkms_nvidia),true)/,/endif/d' -i debian/rules.d/2-binary-arch.mk
+/bin/sed  '/do_dkms_nvidia = true/d' -i debian.master/abi/*/*/*.modules debian/rules debian.master/control.d/vars.*
+/bin/sed  '/nvidiafb/d' -i debian.master/abi/*/*/*.modules debian/rules debian.master/control.d/vars.*
+
+
 # Compile with less modules and avoid abi check
 echo 'skipmodule = true' >> debian.master/rules.d/0-common-vars.mk
 echo 'skipabi = true' >> debian.master/rules.d/0-common-vars.mk