diff --git a/ChangeLog b/ChangeLog
index b59e2d945..56ff263ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-26  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* autogen.sh: Support addition of external modules via `GRUB_CONTRIB'
+	variable.
+	* Makefile.in: Likewise.
+
 2009-10-26  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* gendistlist.sh: Simplify .svn check.  Skip .bzr as well.
diff --git a/Makefile.in b/Makefile.in
index bde80889b..f99bc3c2a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -148,6 +148,9 @@ $(addprefix $(srcdir)/,$(MKFILES)): %.mk: %.rmk genmk.rb
 
 include $(srcdir)/conf/$(target_cpu)-$(platform).mk
 
+# For external modules.
+-include $(wildcard $(GRUB_CONTRIB)/*/conf/common.mk)
+
 ### General targets.
 
 CLEANFILES += $(pkglib_DATA) $(pkgdata_DATA)
diff --git a/autogen.sh b/autogen.sh
index 6895de221..4fb6bf7db 100644
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,8 +5,10 @@ set -e
 autoconf
 autoheader
 echo timestamp > stamp-h.in
-for rmk in conf/*.rmk; do
-  ruby genmk.rb < $rmk > `echo $rmk | sed 's/\.rmk$/.mk/'`
+for rmk in conf/*.rmk ${GRUB_CONTRIB}/*/conf/*.rmk; do
+  if test -e $rmk ; then
+    ruby genmk.rb < $rmk > `echo $rmk | sed 's/\.rmk$/.mk/'`
+  fi
 done
 ./gendistlist.sh > DISTLIST