diff --git a/ChangeLog b/ChangeLog
index 815004080..39a6b5146 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,32 @@
+2010-11-24  Colin Watson  <cjwatson@ubuntu.com>
+
+	* grub-core/Makefile.core.def (kernel): Add kern/emu/cache.S for emu
+	platforms.
+	(grub-emu-lite): Remove kern/emu/cache.S.
+
+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
+	ldflags, to fix link line ordering.
+
+2010-11-23  Colin Watson  <cjwatson@ubuntu.com>
+
+	* grub-core/Makefile.am (gentrigtables): Put -lm after $<; some
+	linkers are picky about this.
+
+2010-11-23  Colin Watson  <cjwatson@ubuntu.com>
+
+	* grub-core/Makefile.am (command.lst): Adjust sed expression
+	ordering so that extended and priority commands aren't treated as
+	ordinary commands.
+
 2010-11-23  Colin Watson  <cjwatson@ubuntu.com>
 
 	* include/grub/gpt_partition.h (GRUB_GPT_PARTITION_TYPE_BIOS_BOOT):
diff --git a/Makefile.util.def b/Makefile.util.def
index 748bb1c59..3e8ae16f5 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -620,5 +620,5 @@ program = {
   ldadd = libgrubmods.a;
   ldadd = libgrubkern.a;
   ldadd = grub-core/gnulib/libgnu.a;
-  ldflags = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR)';
+  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR)';
 };
diff --git a/debian/changelog b/debian/changelog
index 7401e7207..3aaa2cbee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
-grub2 (1.99~20101123-2) UNRELEASED; urgency=low
+grub2 (1.99~20101124-1) UNRELEASED; urgency=low
 
+  * New Bazaar snapshot (command priorities, build fixes, grub-mkdevicemap
+    segfault).
   * Don't try to build grub-efi-amd64 on kfreebsd-i386 or hurd-i386
     (requires gcc-4.4-multilib).
 
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
index 9792dd974..073ce37f6 100644
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -30,7 +30,7 @@ CCASFLAGS_LIBRARY += $(CCASFLAGS_PLATFORM)
 
 # gentrigtables
 gentrigtables: gentrigtables.c
-	$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(CPPFLAGS) -lm $<
+	$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(CPPFLAGS) $< -lm
 CLEANFILES += gentrigtables
 
 # trigtables.c
@@ -237,9 +237,9 @@ command.lst: $(MARKER_FILES)
 	(for pp in $^; do \
 	  b=`basename $$pp .marker`; \
 	  sed -n \
-	    -e "/COMMAND_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/\1: $$b/;p;}" \
 	    -e "/EXTCOMMAND_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/*\1: $$b/;p;}" \
-	    -e "/P1COMMAND_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/*\1: $$b/;p;}" $$pp; \
+	    -e "/P1COMMAND_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/*\1: $$b/;p;}" \
+	    -e "/COMMAND_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/\1: $$b/;p;}" $$pp; \
 	done) | sort -u > $@
 platform_DATA += command.lst
 CLEANFILES += command.lst
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 46c65adac..098df91dc 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -162,6 +162,7 @@ kernel = {
   emu = disk/host.c;
   emu = gnulib/progname.c;
   emu = gnulib/error.c;
+  emu = kern/emu/cache.S;
   emu = kern/emu/console.c;
   emu = kern/emu/getroot.c;
   emu = kern/emu/hostdisk.c;
@@ -208,7 +209,6 @@ program = {
   name = grub-emu-lite;
 
   emu = kern/emu/lite.c;
-  emu = kern/emu/cache.S;
   emu_nodist = symlist.c;
 
   ldadd = 'kernel.img$(EXEEXT)';
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__ */