diff --git a/ChangeLog b/ChangeLog
index ce7330e78..b67ed2cc7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-06-10  Felix Zielcke  <fzielcke@z-51.de>
+
+	* gendistlist.sh (EXTRA_DISTFILES): Add `genhandlerlist.sh' and
+	`genparttoollist.sh'.
+	(DISTDIRS): Add `efiemu', `mmap', `parttool' and `script'.
+	Add `*.sh' to the list find searches for and change `mdate.sh'
+	to `mdate-sh'.
+
 2009-06-10  Pavel Roskin  <proski@gnu.org>
 
 	* include/grub/multiboot2.h: Provide compatibility defines for
diff --git a/gendistlist.sh b/gendistlist.sh
index 011554ddf..5fe5d186b 100644
--- a/gendistlist.sh
+++ b/gendistlist.sh
@@ -16,12 +16,13 @@
 EXTRA_DISTFILES="AUTHORS COPYING ChangeLog DISTLIST INSTALL NEWS README \
 	THANKS TODO Makefile.in aclocal.m4 autogen.sh config.guess \
 	config.h.in config.sub configure configure.ac gencmdlist.sh \
-	gendistlist.sh genfslist.sh geninit.sh geninitheader.sh genkernsyms.sh.in \
-	genmk.rb genmoddep.awk genmodsrc.sh genpartmaplist.sh gensymlist.sh.in
-	install-sh mkinstalldirs stamp-h.in"
+	gendistlist.sh genfslist.sh genhandlerlist.sh geninit.sh \
+	geninitheader.sh genkernsyms.sh.in genmk.rb genmoddep.awk \
+	genmodsrc.sh genpartmaplist.sh genparttoollist.sh \
+	gensymlist.sh.in install-sh mkinstalldirs stamp-h.in"
 
-DISTDIRS="boot bus commands conf disk docs font fs hello hook include io kern lib \
-	loader normal partmap term util video"
+DISTDIRS="boot bus commands conf disk docs efiemu font fs hello hook include io \
+	kern lib loader mmap normal partmap parttool script term util video"
 
 LC_COLLATE=C
 export LC_COLLATE
@@ -37,7 +38,7 @@ for dir in $DISTDIRS; do
   for d in `find $dir -type d | sed '/\/\.svn$/d;\/\.svn\//d' | sort`; do
     find $d -maxdepth 1 -name '*.[chSy]' -o -name '*.mk' -o -name '*.rmk' \
       -o -name '*.rb' -o -name '*.in' -o -name '*.tex' -o -name '*.texi' \
-      -o -name 'grub.cfg' -o -name 'README' -o -name '*.sc' -o -name 'mdate.sh' \
-      | sort
+      -o -name 'grub.cfg' -o -name 'README' -o -name '*.sc' -o -name 'mdate-sh' \
+      -o -name '*.sh' | sort
   done
 done