diff --git a/helpers/make-grub2 b/helpers/make-grub2
index 20e4f583497c8cd27cf40e610917d81906a30d6a..81d07e0d341079fac0a0dcb999124327177239c9 100644
--- a/helpers/make-grub2
+++ b/helpers/make-grub2
@@ -17,7 +17,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=4
+VERSION=5
 COMPONENT=main
 
 . ./config
@@ -57,6 +57,9 @@ echo /bin/sed "/GNU GRUB  version/ s/PACKAGE_VERSION/\"$GRUBVERSION\"/" -i grub-
 changelog "Disable rescue mode by default, branding"
 #sed "s/-.*)/-${REVISION}trisquel${VERSION})/" -i debian/changelog
 
+# Allow Windows and MacOX entries to boot without a password
+sed 's/class osx/class osx --unrestricted/; s/class windows/class osx --unrestricted/;' -i ./util/grub.d/30_os-prober.in
+
 #apt-get install -y --force-yes kvm-pxe
 # /dev is needed for KVM support
 #mount none -t devtmpfs /dev || true