diff --git a/ChangeLog b/ChangeLog
index c0c978dac..34de0864b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-22 Felix Zielcke <fzielcke@z-51.de>
+
+	* util/grub-mkrescue.in (pkglib_DATA): Set to @pkglib_DATA@.
+	* genmk.rb (class SCRIPT): Modify the target file instead of source.
+
 2009-12-22  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* commands/memrw.c (grub_cmd_write): Support for mask parameter.
diff --git a/genmk.rb b/genmk.rb
index 5381aebf5..b3dbe8678 100644
--- a/genmk.rb
+++ b/genmk.rb
@@ -363,8 +363,8 @@ class Script
     "CLEANFILES += #{@name}
 
 #{@name}: #{src} $(#{src}_DEPENDENCIES) config.status
-	sed -i -e 's,@pkglib_DATA@,$(pkglib_DATA),g' $(srcdir)/#{src}
 	./config.status --file=#{name}:#{src}
+	sed -i -e 's,@pkglib_DATA@,$(pkglib_DATA),g' $@
 	chmod +x $@
 
 "
diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index c56525c10..6b3c9ecb8 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -28,7 +28,7 @@ PACKAGE_TARNAME=@PACKAGE_TARNAME@
 PACKAGE_VERSION=@PACKAGE_VERSION@
 target_cpu=@target_cpu@
 native_platform=@platform@
-pkglib_DATA="efiemu32.o efiemu64.o moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst"
+pkglib_DATA="@pkglib_DATA@"
 
 coreboot_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/${target_cpu}-coreboot
 pc_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/${target_cpu}-pc