diff --git a/ChangeLog b/ChangeLog
index 5e63bea4a..169af17ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2013-11-19  Colin Watson  <cjwatson@ubuntu.com>
+
+	* Makefile.util.def (grub-mkimage): Add
+	grub-core/osdep/aros/config.c to extra_dist.
+	* conf/Makefile.extra-dist (EXTRA_DIST): Add docs/autoiso.cfg,
+	docs/osdetect.cfg, grub-core/gnulib-fix-null-deref.diff,
+	grub-core/gnulib-fix-width.diff, grub-core/gnulib-no-abort.diff, and
+	grub-core/gnulib-no-gets.diff.
+
 2013-11-19  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Add automated filesystem checking based on scripts I've used now for
diff --git a/Makefile.util.def b/Makefile.util.def
index 040b846ec..125efdc6a 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -172,6 +172,7 @@ program = {
   common = grub-core/kern/emu/argp_common.c;
   common = grub-core/osdep/init.c;
   common = grub-core/osdep/config.c;
+  extra_dist = grub-core/osdep/aros/config.c;
   extra_dist = grub-core/osdep/windows/config.c;
   extra_dist = grub-core/osdep/unix/config.c;
   common = util/config.c;
diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist
index bf52487f8..87eb45954 100644
--- a/conf/Makefile.extra-dist
+++ b/conf/Makefile.extra-dist
@@ -12,7 +12,9 @@ EXTRA_DIST += util/import_gcry.py
 EXTRA_DIST += util/import_unicode.py
 
 EXTRA_DIST += docs/man
+EXTRA_DIST += docs/autoiso.cfg
 EXTRA_DIST += docs/grub.cfg
+EXTRA_DIST += docs/osdetect.cfg
 
 EXTRA_DIST += conf/i386-pc-cygwin-img-ld.sc
 
@@ -26,6 +28,11 @@ EXTRA_DIST += grub-core/gensymlist.sh
 EXTRA_DIST += grub-core/genemuinit.sh
 EXTRA_DIST += grub-core/genemuinitheader.sh
 
+EXTRA_DIST += grub-core/gnulib-fix-null-deref.diff
+EXTRA_DIST += grub-core/gnulib-fix-width.diff
+EXTRA_DIST += grub-core/gnulib-no-abort.diff
+EXTRA_DIST += grub-core/gnulib-no-gets.diff
+
 EXTRA_DIST += grub-core/lib/libgcrypt
 EXTRA_DIST += grub-core/lib/libgcrypt-grub/mpi/generic
 EXTRA_DIST += $(shell find $(top_srcdir)/include -name '*.h')