diff --git a/ChangeLog b/ChangeLog
index f1667a804..969f9b301 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-10  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* po/POTFILES-shell.in: Autogenerate it.
+
 2013-05-10  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/net/net.c (grub_net_open_real): Autoload network modules.
diff --git a/autogen.sh b/autogen.sh
index 60ae5db8e..d63a79a22 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,6 +7,7 @@ export LC_COLLATE=C
 unset LC_ALL
 
 find . -iname '*.[ch]' -not -ipath './grub-core/lib/libgcrypt-grub/*' -not -ipath './build-aux/*' -not -ipath './grub-core/lib/libgcrypt/src/misc.c' -not -ipath './grub-core/lib/libgcrypt/src/global.c' -not -ipath './grub-core/lib/libgcrypt/src/secmem.c' |sort > po/POTFILES.in
+find util -iname '*.in' -not -name Makefile.in  |sort > po/POTFILES-shell.in
 
 autogen --version >/dev/null || exit 1
 
diff --git a/po/POTFILES-shell.in b/po/POTFILES-shell.in
deleted file mode 100644
index 46c589f03..000000000
--- a/po/POTFILES-shell.in
+++ /dev/null
@@ -1,21 +0,0 @@
-util/grub.d/00_header.in
-util/grub.d/10_hurd.in
-util/grub.d/10_illumos.in
-util/grub.d/10_kfreebsd.in
-util/grub.d/10_linux.in
-util/grub.d/10_netbsd.in
-util/grub.d/10_windows.in
-util/grub.d/20_linux_xen.in
-util/grub.d/30_os-prober.in
-util/grub.d/40_custom.in
-util/grub.d/41_custom.in
-util/grub-install.in
-util/grub-kbdcomp.in
-util/grub-mkconfig.in
-util/grub-mkconfig_lib.in
-util/grub-mknetdir.in
-util/grub-mkrescue.in
-util/grub-mkstandalone.in
-util/grub-reboot.in
-util/grub-set-default.in
-util/powerpc/ieee1275/grub-mkrescue.in