diff --git a/po/Makevars b/po/Makevars
index 7dbbd801..3142b13c 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -46,6 +46,13 @@ XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --width=132 \
 # $(DOMAIN).pot file.
 COPYRIGHT_HOLDER = John Zaitseff
 
+# This tells whether or not to prepend "GNU " prefix to the package
+# name that gets inserted into the header of the $(DOMAIN).pot file.
+# Possible values are "yes", "no", or empty.  If it is empty, try to
+# detect it automatically by scanning the files in $(top_srcdir) for
+# "GNU packagename" string.
+PACKAGE_GNU = no
+
 # This is the email address or URL to which the translators shall report
 # bugs in the untranslated strings.
 MSGID_BUGS_ADDRESS = J.Zaitseff@zap.org.au
@@ -64,7 +71,7 @@ USE_MSGCTXT = yes
 MSGMERGE_OPTIONS = --width=132
 
 # These options get passed to msginit.
-MSGINIT_OPTIONS =
+MSGINIT_OPTIONS = --width=132
 
 # This tells whether or not to regenerate a PO file when $(DOMAIN).pot
 # has changed.  Possible values are "yes" and "no".  Set this to no if