diff --git a/ChangeLog b/ChangeLog
index 4a09faca4..5f38faf42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
index 131fa5fd7..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