diff --git a/vncviewer/CMakeLists.txt b/vncviewer/CMakeLists.txt
index 282ed9d..e04e335 100644
--- a/vncviewer/CMakeLists.txt
+++ b/vncviewer/CMakeLists.txt
@@ -59,15 +59,36 @@
 install(TARGETS vncviewer DESTINATION ${BIN_DIR})
 if(UNIX)
   install(FILES vncviewer.man DESTINATION ${MAN_DIR}/man1 RENAME vncviewer.1)
+
   configure_file(vncviewer.desktop.in.in vncviewer.desktop.in)
-  add_custom_command(OUTPUT vncviewer.desktop
-    COMMAND ${GETTEXT_MSGFMT_EXECUTABLE}
-              --desktop --template vncviewer.desktop.in
-              -d ${CMAKE_SOURCE_DIR}/po -o vncviewer.desktop
-    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop.in
-  )
+  find_program(INTLTOOL_MERGE_EXECUTABLE intltool-merge)
+  if("${GETTEXT_VERSION_STRING}" VERSION_GREATER 0.17.99)
+    add_custom_command(OUTPUT vncviewer.desktop
+      COMMAND ${GETTEXT_MSGFMT_EXECUTABLE}
+                --desktop --template vncviewer.desktop.in
+                -d ${CMAKE_SOURCE_DIR}/po -o vncviewer.desktop
+      DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop.in
+    )
+  elseif(INTLTOOL_MERGE_EXECUTABLE)
+    add_custom_command(OUTPUT vncviewer.desktop
+      COMMAND sed -e 's/^Name/_Name/'
+                -e 's/^GenericName/_GenericName/'
+                -e 's/^Comment/_Comment/'
+                vncviewer.desktop.in > vncviewer.desktop.intl
+      COMMAND ${INTLTOOL_MERGE_EXECUTABLE}
+                -d ${CMAKE_SOURCE_DIR}/po
+                vncviewer.desktop.intl vncviewer.desktop
+      DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop.in
+    )
+  else()
+    add_custom_command(OUTPUT vncviewer.desktop
+      COMMAND cp vncviewer.desktop.in vncviewer.desktop
+      DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop.in
+    )
+  endif()
   add_custom_target(desktop ALL DEPENDS vncviewer.desktop)
   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop DESTINATION ${DATA_DIR}/applications)
+
   foreach(res 16 22 24 32 48)
     install(FILES ../media/icons/tigervnc_${res}.png DESTINATION ${DATA_DIR}/icons/hicolor/${res}x${res}/apps RENAME tigervnc.png)
   endforeach()