diff --git a/modules/rhizomatica_base_system/files/etc/default/grub b/modules/rhizomatica_base_system/files/etc/default/grub
new file mode 100644
index 0000000..5d7e813
--- /dev/null
+++ b/modules/rhizomatica_base_system/files/etc/default/grub
@@ -0,0 +1,37 @@
+# If you change this file, run 'update-grub' afterwards to update
+# /boot/grub/grub.cfg.
+# For full documentation of the options in this file, see:
+#   info -f grub -n 'Simple configuration'
+
+GRUB_DEFAULT=0
+#GRUB_HIDDEN_TIMEOUT=0
+GRUB_HIDDEN_TIMEOUT_QUIET=true
+GRUB_TIMEOUT=2
+GRUB_DISTRIBUTOR=`lsb_release -i -s 2> /dev/null || echo Debian`
+GRUB_CMDLINE_LINUX_DEFAULT=""
+GRUB_CMDLINE_LINUX=""
+
+# Uncomment to enable BadRAM filtering, modify to suit your needs
+# This works with Linux (no patch required) and with any kernel that obtains
+# the memory map information from GRUB (GNU Mach, kernel of FreeBSD ...)
+#GRUB_BADRAM="0x01234567,0xfefefefe,0x89abcdef,0xefefefef"
+
+# Uncomment to disable graphical terminal (grub-pc only)
+#GRUB_TERMINAL=console
+
+# The resolution used on graphical terminal
+# note that you can use only modes which your graphic card supports via VBE
+# you can see them in real GRUB with the command `vbeinfo'
+#GRUB_GFXMODE=640x480
+
+# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to Linux
+#GRUB_DISABLE_LINUX_UUID=true
+
+# Uncomment to disable generation of recovery mode menu entries
+#GRUB_DISABLE_RECOVERY="true"
+
+# Uncomment to get a beep at grub start
+#GRUB_INIT_TUNE="480 440 1"
+
+# Boot even in case of failed shutdown (power loss)
+GRUB_RECORDFAIL_TIMEOUT=2
diff --git a/modules/rhizomatica_base_system/manifests/init.pp b/modules/rhizomatica_base_system/manifests/init.pp
index c89cbdc..84ecace 100644
--- a/modules/rhizomatica_base_system/manifests/init.pp
+++ b/modules/rhizomatica_base_system/manifests/init.pp
@@ -80,6 +80,17 @@ class rhizomatica_base_system {
   include ntp
   include kannel
 
+#Grub fix
+  file { '/etc/default/grub':
+      ensure  => present,
+      source  => 'puppet:///modules/rhizomatica_base_system/etc/default/grub',
+      notify  => Exec['update-grub'],
+    }
+
+  exec { 'update-grub':
+      refreshonly => true,
+    }
+
 #Rizhomatica scripts
   file { '/home/rhizomatica/bin':
       ensure  => directory,