diff --git a/ChangeLog b/ChangeLog
index f0dee54e2..13da46b54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-28  Robert Millan  <rmh@aybabtu.com>
+
+	* util/update-grub.in: Reorganise terminal validity check.  Accept
+	`ieee1275:console' (OLPC) and `*:gfxterm' as valid too.
+	Based on suggestion by Franklin PIAT.
+
 2008-02-28  Fabian Greffrath  <greffrath@leat.rub.de>
 
 	* include/grub/util/getroot.h (grub_util_check_block_device): Export new
diff --git a/util/update-grub.in b/util/update-grub.in
index b4bb6058d..77c19a14d 100644
--- a/util/update-grub.in
+++ b/util/update-grub.in
@@ -124,10 +124,10 @@ fi
 # fallback to our default
 case ${platform}:${GRUB_TERMINAL} in
   pc:)				GRUB_TERMINAL=gfxterm ;;
-  pc:console | pc:serial)	;;
   ieee1275:)			GRUB_TERMINAL=ofconsole ;;
-  ieee1275:ofconsole)		;;
   *:)				GRUB_TERMINAL=console ;;
+  pc:console | pc:serial | ieee1275:ofconsole | ieee1275:console | *:gfxterm)
+				;;
   *:*)				echo "Invalid terminal \"${GRUB_TERMINAL}\"" >&2 ; exit 1 ;;
 esac