diff --git a/po/ChangeLog b/po/ChangeLog
index d11dcedd3..d39c3a201 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-22  Pavel Roskin  <proski@gnu.org>
+
+	* Makevars: Add --no-location to msgmerge arguments.
+	* update.pl: Likewise.
+	* update.sh: Likewise.
+
 2005-05-19  Roland Illig  <roland.illig@gmx.de>
 
 	* de.po: Updated German translation.
diff --git a/po/Makevars b/po/Makevars
index 378d7e46c..84a7ca48a 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -39,3 +39,7 @@ MSGID_BUGS_ADDRESS = mc-devel@gnome.org
 # This is the list of locale categories, beyond LC_MESSAGES, for which the
 # message catalogs shall be used.  It is usually empty.
 EXTRA_LOCALE_CATEGORIES =
+
+# Suppress location information
+MSGMERGE = msgmerge --no-location
+MSGMERGE_UPDATE = msgmerge --update --no-location
diff --git a/po/update.pl b/po/update.pl
index 90cdc172c..ccb6d7b42 100755
--- a/po/update.pl
+++ b/po/update.pl
@@ -146,7 +146,7 @@ elsif(-s "$LANG.po"){
     print "\nNow merging $LANG.po with $PACKAGE.pot, and creating an updated $LANG.po ...\n";
 
     
-    $d="mv $LANG.po $LANG.po.old && msgmerge $LANG.po.old $PACKAGE.pot -o $LANG.po";
+    $d="mv $LANG.po $LANG.po.old && msgmerge --no-location $LANG.po.old $PACKAGE.pot -o $LANG.po";
 
     $f="msgfmt --statistics $LANG.po";
 
diff --git a/po/update.sh b/po/update.sh
index 951f6d7e3..6e3e1331c 100755
--- a/po/update.sh
+++ b/po/update.sh
@@ -60,7 +60,7 @@ xgettext --default-domain=$PACKAGE --directory=.. \
 echo "Building the $PACKAGE.pot ..."
 echo "Now merging $1.po with $PACKAGE.pot, and creating an updated $1.po ..." 
 
-mv $1.po $1.po.old && msgmerge $1.po.old $PACKAGE.pot -o $1.po \
+mv $1.po $1.po.old && msgmerge --no-location $1.po.old $PACKAGE.pot -o $1.po \
 && rm $1.po.old;
 
 msgfmt --statistics $1.po