diff --git a/po/pofilelist.txt b/po/pofilelist.txt
index 6860b55a..c624a50a 100644
--- a/po/pofilelist.txt
+++ b/po/pofilelist.txt
@@ -1,47 +1,3 @@
-htdocs/always.php
-htdocs/caldav.php
-htdocs/feed.php
-htdocs/freebusy.php
-htdocs/help.php
-htdocs/public.php
-htdocs/setup.php
-htdocs/tools.php
-htdocs/upgrade.php
-htdocs/well-known.php
-inc/auth-functions.php
-inc/caldav-BIND.php
-inc/caldav-DELETE.php
-inc/caldav-GET.php
-inc/caldav-MKCOL.php
-inc/caldav-MOVE.php
-inc/caldav-OPTIONS.php
-inc/caldav-PROPFIND.php
-inc/caldav-PROPPATCH.php
-inc/caldav-PUT-default.php
-inc/caldav-PUT-functions.php
-inc/caldav-PUT.php
-inc/caldav-PUT-vcard.php
-inc/caldav-REPORT-calquery.php
-inc/caldav-REPORT-cardquery.php
-inc/caldav-REPORT.php
-inc/caldav-REPORT-sync-collection.php
-inc/CalDAVRequest.php
-inc/DAViCalSession.php
-inc/DAVResource.php
-inc/drivers_imap_pam.php
-inc/drivers_ldap.php
-inc/drivers_pwauth_pam.php
-inc/drivers_squid_pam.php
-inc/interactive-page.php
-inc/iSchedule.php
-inc/other_translated_strings.php
-inc/page-header.php
-inc/Principal.php
-inc/ui/collection-edit.php
-inc/ui/principal-browse.php
-inc/ui/principal-edit.php
-inc/WritableCollection.php
-
 ../awl/inc/classBrowser.php
 ../awl/inc/classEditor.php
 ../awl/inc/DataEntry.php
@@ -49,4 +5,6 @@ inc/WritableCollection.php
 ../awl/inc/PgQuery.php
 ../awl/inc/Session.php
 ../awl/inc/User.php
+../awl/inc/vCalendar.php
+../awl/inc/vComponent.php
 
diff --git a/scripts/po/rebuild-translations.sh b/scripts/po/rebuild-translations.sh
index 069aabbd..a6301260 100755
--- a/scripts/po/rebuild-translations.sh
+++ b/scripts/po/rebuild-translations.sh
@@ -20,10 +20,12 @@ if [ ! -d "${AWL_LOCATION}" ]; then
   fi
 fi
 
-sed "s:../awl:${AWL_LOCATION}:" ${PODIR}/pofilelist.txt > ${PODIR}/pofilelist.tmp
+egrep -l '(i18n|translate)' htdocs/*.php inc/*.php inc/ui/*.php > ${PODIR}/pofilelist.tmp1
+sed "s:../awl:${AWL_LOCATION}:" ${PODIR}/pofilelist.txt >> ${PODIR}/pofilelist.tmp1
+sort ${PODIR}/pofilelist.tmp1 | uniq > ${PODIR}/pofilelist.tmp
 xgettext --no-location --add-comments=Translators --keyword=translate --keyword=i18n --output=${PODIR}/messages.tmp -s -f ${PODIR}/pofilelist.tmp
 sed 's.^"Content-Type: text/plain; charset=CHARSET\\n"."Content-Type: text/plain; charset=UTF-8\\n".' ${PODIR}/messages.tmp > ${PODIR}/messages.pot
-rm ${PODIR}/messages.tmp ${PODIR}/pofilelist.tmp
+rm ${PODIR}/messages.tmp ${PODIR}/pofilelist.tmp ${PODIR}/pofilelist.tmp1
 
 locale_list() {
   ls ${PODIR}/*.po | cut -f2 -d/ | cut -f1 -d.