--- /etc/univention/templates/files/etc/default/grub_ORIG	2016-02-01 09:14:44.000000000 +0100
+++ /etc/univention/templates/files/etc/default/grub	2016-02-06 14:04:53.541992496 +0100
@@ -34,9 +34,20 @@
 # 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
-
+# Configure UCR Variable "grub/terminal" to disable graphical terminal (grub-pc only)'
+@!@
+if configRegistry.get('grub/terminal'):
+        print 'GRUB_TERMINAL="%s"' % configRegistry.get('grub/terminal')
+else:
+        print '#GRUB_TERMINAL="console"'
+@!@
+# Configure UCR Variable "grub/serialcommand" to adapt GRUB_SERIAL_COMMAND settings 
+@!@
+if configRegistry.get('grub/serialcommand'):
+        print 'GRUB_SERIAL_COMMAND="%s"' % configRegistry.get('grub/serialcommand')
+else:
+	print '#GRUB_SERIAL_COMMAND="serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1"'
+@!@
 # 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'