diff --git a/helpers/DATA/grub2/0007-prevent-duplicated-gnu-linux-with-trisquel-full-name.patch b/helpers/DATA/grub2/0007-prevent-duplicated-gnu-linux-with-trisquel-full-name.patch
new file mode 100644
index 0000000..1d49f7e
--- /dev/null
+++ b/helpers/DATA/grub2/0007-prevent-duplicated-gnu-linux-with-trisquel-full-name.patch
@@ -0,0 +1,22 @@
+Prevent duplicated GNU/Linux string with Trisquel's full name.
+
+diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+index cc393be7..f13c4774 100644
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -31,7 +31,14 @@ CLASS="--class gnu-linux --class gnu --class os"
+ if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
+   OS=GNU/Linux
+ else
+-  OS="${GRUB_DISTRIBUTOR} GNU/Linux"
++  case ${GRUB_DISTRIBUTOR} in
++      "Trisquel GNU/Linux")
++      OS="${GRUB_DISTRIBUTOR}"
++      ;;
++      *)
++      OS="${GRUB_DISTRIBUTOR} GNU/Linux"
++      ;;
++  esac
+   CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
+ fi
+ 
diff --git a/helpers/make-grub2 b/helpers/make-grub2
index 1388e3f..4a805f7 100644
--- a/helpers/make-grub2
+++ b/helpers/make-grub2
@@ -19,7 +19,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=8
+VERSION=9
 COMPONENT=main
 DEPENDS=base-files
 
@@ -33,6 +33,7 @@ done
 
 # Remove patch renaming GNU/Linux as default distributor.
 remove_patch ubuntu-zfs-mkconfig-ubuntu-distributor.patch
+remove_patch mkconfig-ubuntu-distributor.patch
 
 # Allow passwords https://bugs.launchpad.net/ubuntu/+source/grub2/+bug/1311302
 for i in $(grep -rl 'CLASS="' util/grub.d/|grep -v 30_os-prober.in)