diff --git a/CHANGELOG b/CHANGELOG
index a9b0ecf62..7b3f051a1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,9 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o [Zenmap] Fixed internationalization files. Running in a language
+  other than the default English would result in the error
+  "ValueError: too many values to unpack". [David Fifield]
+
 o Changed the --webxml XSL stylesheet to point to the new location of
   nmap.xsl in the new respository,
     https://svn.nmap.org/nmap/docs/nmap.xsl
diff --git a/zenmap/share/zenmap/locale/de/LC_MESSAGES/zenmap.mo b/zenmap/share/zenmap/locale/de/LC_MESSAGES/zenmap.mo
index d9dd89a6c..56dfca961 100644
Binary files a/zenmap/share/zenmap/locale/de/LC_MESSAGES/zenmap.mo and b/zenmap/share/zenmap/locale/de/LC_MESSAGES/zenmap.mo differ
diff --git a/zenmap/share/zenmap/locale/fr/LC_MESSAGES/zenmap.mo b/zenmap/share/zenmap/locale/fr/LC_MESSAGES/zenmap.mo
index 69731f581..59b09e294 100644
Binary files a/zenmap/share/zenmap/locale/fr/LC_MESSAGES/zenmap.mo and b/zenmap/share/zenmap/locale/fr/LC_MESSAGES/zenmap.mo differ
diff --git a/zenmap/share/zenmap/locale/hr/LC_MESSAGES/zenmap.mo b/zenmap/share/zenmap/locale/hr/LC_MESSAGES/zenmap.mo
index 9d5a367f7..4fca70b67 100644
Binary files a/zenmap/share/zenmap/locale/hr/LC_MESSAGES/zenmap.mo and b/zenmap/share/zenmap/locale/hr/LC_MESSAGES/zenmap.mo differ
diff --git a/zenmap/share/zenmap/locale/it/LC_MESSAGES/zenmap.mo b/zenmap/share/zenmap/locale/it/LC_MESSAGES/zenmap.mo
index 1fa6763a2..60321bdd8 100644
Binary files a/zenmap/share/zenmap/locale/it/LC_MESSAGES/zenmap.mo and b/zenmap/share/zenmap/locale/it/LC_MESSAGES/zenmap.mo differ
diff --git a/zenmap/share/zenmap/locale/ja/LC_MESSAGES/zenmap.mo b/zenmap/share/zenmap/locale/ja/LC_MESSAGES/zenmap.mo
index 097c8ad99..5810f52c7 100644
Binary files a/zenmap/share/zenmap/locale/ja/LC_MESSAGES/zenmap.mo and b/zenmap/share/zenmap/locale/ja/LC_MESSAGES/zenmap.mo differ
diff --git a/zenmap/share/zenmap/locale/pt_BR/LC_MESSAGES/zenmap.mo b/zenmap/share/zenmap/locale/pt_BR/LC_MESSAGES/zenmap.mo
index dc78aa531..521d1ea79 100644
Binary files a/zenmap/share/zenmap/locale/pt_BR/LC_MESSAGES/zenmap.mo and b/zenmap/share/zenmap/locale/pt_BR/LC_MESSAGES/zenmap.mo differ
diff --git a/zenmap/share/zenmap/locale/ru/LC_MESSAGES/zenmap.mo b/zenmap/share/zenmap/locale/ru/LC_MESSAGES/zenmap.mo
index fb7dc5365..b2493fdde 100644
Binary files a/zenmap/share/zenmap/locale/ru/LC_MESSAGES/zenmap.mo and b/zenmap/share/zenmap/locale/ru/LC_MESSAGES/zenmap.mo differ