diff --git a/ChangeLog b/ChangeLog
index 9b01330d5..c6bbffd99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-11-23  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/deviceiter.c (compare_devices): If the by-id link for a
+	device couldn't be resolved, fall back to sorting by the by-id link
+	rather than segfaulting.
+	Reported and tested by: Daniel Mierswa.
+
 2010-11-23  Colin Watson  <cjwatson@ubuntu.com>
 
 	* Makefile.util.def (grub-menulst2cfg): List libraries in ldadd, not
diff --git a/util/deviceiter.c b/util/deviceiter.c
index 34d34b7bb..1de8e54df 100644
--- a/util/deviceiter.c
+++ b/util/deviceiter.c
@@ -485,12 +485,15 @@ compare_devices (const void *a, const void *b)
 {
   const struct device *left = (const struct device *) a;
   const struct device *right = (const struct device *) b;
-  int ret;
-  ret = strcmp (left->kernel, right->kernel);
-  if (ret)
-    return ret;
-  else
-    return strcmp (left->stable, right->stable);
+
+  if (left->kernel && right->kernel)
+    {
+      int ret = strcmp (left->kernel, right->kernel);
+      if (ret)
+	return ret;
+    }
+
+  return strcmp (left->stable, right->stable);
 }
 #endif /* __linux__ */