diff --git a/debian/changelog b/debian/changelog
index 54d6a17c..c44ceb5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,12 @@ byobu (2.24) unreleased; urgency=low
     screen's manpage; wrap $STY in double quotes; use -n rather than -z;
     LP: #403988, LP: #403809
 
- -- Dustin Kirkland <kirkland@ubuntu.com>  Fri, 24 Jul 2009 08:29:49 -0500
+  [ Dustin Kirkland ]
+  * debian/rules: fix update-pot section of rules file; previous code
+    was only actually gathering messages from the last file input
+    (byobu-config); this joins the code properly
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Fri, 24 Jul 2009 08:54:31 -0500
 
 byobu (2.23-0ubuntu1) karmic; urgency=low
 
diff --git a/debian/rules b/debian/rules
index d33f4b3f..80018ef1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,12 +20,8 @@ install-po: update-pot
 
 update-pot:
 	rm -f po/${PKG}.pot
-	grep -v "^#" po/POTFILES.sh | while read po ; do \
-		xgettext -o po/${PKG}.pot -L Shell $${po} ; \
-	done
-	grep -v "^#" po/POTFILES.python | while read po ; do \
-		xgettext -o po/${PKG}.pot -L Python $${po} ; \
-	done
+	xgettext -f po/POTFILES.Shell -o po/${PKG}.pot -L Shell
+	xgettext -f po/POTFILES.Python -o po/${PKG}.pot -L Python -j
 	for po in po/*.po ; do \
 		msgmerge $${po} po/${PKG}.pot -o $${po} ; \
 	done
diff --git a/po/POTFILES.python b/po/POTFILES.Python
similarity index 100%
rename from po/POTFILES.python
rename to po/POTFILES.Python
diff --git a/po/POTFILES.sh b/po/POTFILES.Shell
similarity index 100%
rename from po/POTFILES.sh
rename to po/POTFILES.Shell