diff --git a/ChangeLog b/ChangeLog
index 0ab86b8f8..69b65bf67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-14  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub.d/30_os-prober.in: Cope with Windows 7 in os-prober
+	output.
+
 2009-09-13  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* configure.ac: Remove --enable-grub-pe2elf.  Only build
diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
index ffc46c9d4..4a1648881 100644
--- a/util/grub.d/30_os-prober.in
+++ b/util/grub.d/30_os-prober.in
@@ -57,11 +57,16 @@ menuentry "${LONGNAME} (on ${DEVICE})" {
 EOF
       prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/"
 
-      if [ "${LONGNAME}" != "Windows Vista (loader)" ] ; then
-        cat << EOF
+      case ${LONGNAME} in
+	Windows\ Vista*|Windows\ 7*)
+	;;
+	*)
+	  cat << EOF
 	drivemap -s (hd0) \${root}
 EOF
-      fi
+	;;
+      esac
+
       cat <<EOF
 	chainloader +1
 }