diff --git a/Scripts/Bash/Functions/Locale/locale_updateMessageMetadata.sh b/Scripts/Bash/Functions/Locale/locale_updateMessageMetadata.sh
index bfd73fd..5cca196 100755
--- a/Scripts/Bash/Functions/Locale/locale_updateMessageMetadata.sh
+++ b/Scripts/Bash/Functions/Locale/locale_updateMessageMetadata.sh
@@ -53,8 +53,8 @@ function locale_updateMessageMetadata {
 
     # Define replacement lines for pattern line.
     DST[0]="\"Project-Id-Version: ${CLI_NAME}-${CLI_VERSION}\\\n\""
-    DST[1]="\"Report-Msgid-Bugs-To: Translation SIG\\\n\""
-    DST[2]="\"Last-Translator: Translation SIG <${MAILINGLIST_L10N}>\\\n\""
+    DST[1]="\"Report-Msgid-Bugs-To: Documentation SIG <${MAILINGLIST_DOCS}>\\\n\""
+    DST[2]="\"Last-Translator: Documentation SIG\\\n\""
     DST[3]="\"Language-Team: ${LANGNAME}\\\n\""
     DST[4]="\"PO-Revision-Date: $(date "+%F %H:%M%z")\\\n\""
 
@@ -77,6 +77,14 @@ function locale_updateMessageMetadata {
     # Replace package information using gettext domain information.
     sed -i -r "s/PACKAGE/${CLI_NAME}-${CLI_VERSION}/g" ${FILE}
 
+    # Remove absolute path to the working copy so it doesn't appear on
+    # comments related to locations. Remember that people can download
+    # their working copies in different locations and we don't want to
+    # version those changes each time a translation message be
+    # updated. To be consistent about this, show path information from
+    # trunk level on. Don't show the variable part of the path.
+    sed -i -r "s,${TCAR_WORKDIR}/,,g" ${FILE}
+
     # Expand translation markers inside file.
     cli_expandTMarkers ${FILE}