diff --git a/solenv/bin/hrcex b/solenv/bin/hrcex
index 8e897ea1fca3..5d5fffd486d6 100755
--- a/solenv/bin/hrcex
+++ b/solenv/bin/hrcex
@@ -29,7 +29,6 @@ with open(ofile, "a") as output:
         for entry in po:
             keyid = entry.msgctxt + '|' + entry.msgid
             print >> output, '#. ' + polib.genKeyId(keyid)
-            location = entry.occurrences[0][0]
-            location = os.path.relpath(location, os.environ['SRCDIR'])
-            entry.occurrences[0] = location, entry.occurrences[0][1]
+            for i, occurrence in enumerate(entry.occurrences):
+                entry.occurrences[i] = os.path.relpath(occurrence[0], os.environ['SRCDIR']), occurrence[1]
             print >> output, entry
diff --git a/solenv/bin/uiex b/solenv/bin/uiex
index bade6149c382..c9b00b2e062c 100755
--- a/solenv/bin/uiex
+++ b/solenv/bin/uiex
@@ -29,7 +29,6 @@ with open(ofile, "a") as output:
         for entry in po:
             keyid = entry.msgctxt + '|' + entry.msgid
             print >> output, '#. ' + polib.genKeyId(keyid)
-            location = entry.occurrences[0][0]
-            location = os.path.relpath(location, os.environ['SRCDIR'])
-            entry.occurrences[0] = location, entry.occurrences[0][1]
+            for i, occurrence in enumerate(entry.occurrences):
+                entry.occurrences[i] = os.path.relpath(occurrence[0], os.environ['SRCDIR']), occurrence[1]
             print >> output, entry