diff --git a/Makefile.bundle.in b/Makefile.bundle.in
index c49440ede1..756f208e6a 100644
--- a/Makefile.bundle.in
+++ b/Makefile.bundle.in
@@ -85,7 +85,7 @@ endif
 	$(Q)cp "$(BIN_DIR)/scripts/"*             "$(BUNDLE_DIR)/scripts/"
 ifdef MENU_DIR
 	$(Q)cp "$(ROOT_DIR)/media/openttd.desktop" "$(BUNDLE_DIR)/media/"
-	$(Q)$(AWK) -f "$(ROOT_DIR)/media/openttd.desktop.translation.awk" "$(SRC_DIR)/lang/"*.txt | $(SORT) >> "$(BUNDLE_DIR)/media/openttd.desktop"
+	$(Q)$(AWK) -f "$(ROOT_DIR)/media/openttd.desktop.translation.awk" "$(SRC_DIR)/lang/"*.txt | $(SORT) |  $(AWK) -f "$(ROOT_DIR)/media/openttd.desktop.filter.awk" >> "$(BUNDLE_DIR)/media/openttd.desktop"
 	$(Q)sed s/=openttd/=$(BINARY_NAME)/g "$(BUNDLE_DIR)/media/openttd.desktop" > "$(ROOT_DIR)/media/openttd.desktop.install"
 endif
 ifeq ($(TTD), openttd.exe)
diff --git a/media/openttd.desktop.filter.awk b/media/openttd.desktop.filter.awk
new file mode 100644
index 0000000000..06cf1106da
--- /dev/null
+++ b/media/openttd.desktop.filter.awk
@@ -0,0 +1,13 @@
+# $Id: openttd.desktop.translation.awk 19884 2010-05-22 19:59:37Z rubidium $
+
+# This file is part of OpenTTD.
+# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+# OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Awk script to automatically remove duplicate Comment[i]= lines
+#
+
+BEGIN { FS = "="; last = "" }
+{ if (last != $1) { print $0 }; last = $1 }
diff --git a/media/openttd.desktop.translation.awk b/media/openttd.desktop.translation.awk
index 943cb498f5..ee8fdd9700 100644
--- a/media/openttd.desktop.translation.awk
+++ b/media/openttd.desktop.translation.awk
@@ -6,10 +6,10 @@
 # See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
 
 #
-# Awk script to automatically generate a single comment line
-# for a translated desktop shortcut. If it does not exist there
+# Awk script to automatically generate a comment lines for
+# a translated desktop shortcut. If it does not exist there
 # is no output.
 #
 
 /##isocode/ { lang = $2; next }
-/STR_DESKTOP_SHORTCUT_COMMENT/ { sub("^[^:]*:", "", $0); print "Comment[" lang "]=" $0; next}
+/STR_DESKTOP_SHORTCUT_COMMENT/ { sub("^[^:]*:", "", $0); print "Comment[" lang "]=" $0; sub("_.*", "", lang); print "Comment[" lang "]=" $0; next}