diff --git a/ChangeLog b/ChangeLog
index dd0d172ed..c9e62f500 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-20  Colin Watson  <cjwatson@ubuntu.com>
+
+	* Makefile.am (SUBDIRS): Restore "."; it's important to force
+	ordering, so that e.g. ascii.h is built before grub-core/font/font.c
+	when needed.
+
 2010-09-20  Colin Watson  <cjwatson@ubuntu.com>
 
 	* grub-core/commands/efi/lsefisystab.c: Correct header.
diff --git a/Makefile.am b/Makefile.am
index 46275e175..931ea02e8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
 DEPDIR = .deps-util
-SUBDIRS = grub-core/gnulib grub-core po docs util/bash-completion.d
+SUBDIRS = grub-core/gnulib . grub-core po docs util/bash-completion.d
 
 include $(top_srcdir)/conf/Makefile.common
 include $(top_srcdir)/conf/Makefile.extra-dist