diff --git a/ChangeLog b/ChangeLog
index e132a24f3..0b929cf74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-18  Felix Zielcke  <fzielcke@z-51.de>
+
+	* util/grub-mkconfig.in: Don't use gfxterm by default if not
+	explicitly specified by the user.
+
 2009-08-18  Pavel Roskin  <proski@gnu.org>
 
 	* include/grub/fbfill.h (struct grub_video_fbrender_target): Use
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 5865b89ce..93f96525e 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -141,13 +141,7 @@ if [ "x${GRUB_TERMINAL}" != "x" ] ; then
 fi
 
 case x${GRUB_TERMINAL_OUTPUT} in
-  x)
-    # If this platform supports gfxterm, try to use it.
-    if test -e ${grub_prefix}/gfxterm.mod ; then
-      GRUB_TERMINAL_OUTPUT=gfxterm
-    fi
-  ;;
-  xconsole | xserial | xofconsole | xgfxterm) ;;
+  x | xconsole | xserial | xofconsole | xgfxterm) ;;
   *) echo "Invalid output terminal \"${GRUB_TERMINAL_OUTPUT}\"" >&2 ; exit 1 ;;
 esac