diff --git a/CMakeLists.txt b/CMakeLists.txt
index 40cd595a..28feb7e8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,6 +82,8 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW)
 	ELSE()
 		SET(MEGAGLEST_BIN_INSTALL_PATH "bin/")
 		SET(MEGAGLEST_DATA_INSTALL_PATH "share/megaglest/")
+                SET(MEGAGLEST_DESKTOP_INSTALL_PATH "share/applications/")
+                SET(MEGAGLEST_ICON_INSTALL_PATH "share/pixmaps/")
 		SET(CUSTOM_DATA_INSTALL_PATH "'\\\"${CMAKE_INSTALL_PREFIX}/${MEGAGLEST_DATA_INSTALL_PATH}\\\"'")
 		SET(CUSTOM_DATA_INSTALL_PATH_VALUE "-DCUSTOM_DATA_INSTALL_PATH=${CUSTOM_DATA_INSTALL_PATH}")
 
diff --git a/source/configurator/CMakeLists.txt b/source/configurator/CMakeLists.txt
index c2ca8f13..21771b91 100644
--- a/source/configurator/CMakeLists.txt
+++ b/source/configurator/CMakeLists.txt
@@ -133,4 +133,10 @@ IF(NOT CMAKE_INSTALL_PREFIX STREQUAL "")
           "${PROJECT_SOURCE_DIR}/mk/linux/configuration.xml"
           "${PROJECT_SOURCE_DIR}/mk/linux/glest.ico"
 	  DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
+
+	# Installation of the program desktop icon file
+	INSTALL(FILES 
+	  "${PROJECT_SOURCE_DIR}/mk/linux/glest.ico"
+	  DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
+
 ENDIF()
diff --git a/source/g3d_viewer/CMakeLists.txt b/source/g3d_viewer/CMakeLists.txt
index b68bcb05..2c3cdbba 100644
--- a/source/g3d_viewer/CMakeLists.txt
+++ b/source/g3d_viewer/CMakeLists.txt
@@ -133,4 +133,10 @@ IF(NOT CMAKE_INSTALL_PREFIX STREQUAL "")
 	  "${PROJECT_SOURCE_DIR}/mk/linux/glestkeys.ini"
 	  "${PROJECT_SOURCE_DIR}/data/glest_game/g3dviewer.ico"
 	  DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
+
+	# Installation of the program desktop icon file
+	INSTALL(FILES 
+	  "${PROJECT_SOURCE_DIR}/data/glest_game/g3dviewer.ico"
+	  DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
+
 ENDIF()
diff --git a/source/glest_game/CMakeLists.txt b/source/glest_game/CMakeLists.txt
index 693d6a79..318b5082 100644
--- a/source/glest_game/CMakeLists.txt
+++ b/source/glest_game/CMakeLists.txt
@@ -192,6 +192,10 @@ TARGET_LINK_LIBRARIES(${TARGET_NAME} ${EXTERNAL_LIBS})
 
 # Requires an install prefix for the items below to work
 IF(NOT CMAKE_INSTALL_PREFIX STREQUAL "")
+	IF(NOT WIN32)
+		set_target_properties(megaglest.bin PROPERTIES OUTPUT_NAME "megaglest")
+	ENDIF()
+
 	# Installation of the program
 	INSTALL(TARGETS 
 		${TARGET_NAME} 
@@ -204,6 +208,16 @@ IF(NOT CMAKE_INSTALL_PREFIX STREQUAL "")
 	  "${PROJECT_SOURCE_DIR}/mk/linux/megaglest.bmp"
 	  DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
 
+	# Installation of the program desktop file
+	INSTALL(FILES 
+	  "${PROJECT_SOURCE_DIR}/mk/linux/megaglest.desktop"
+	  DESTINATION ${MEGAGLEST_DESKTOP_INSTALL_PATH})
+
+	# Installation of the program desktop icon file
+	INSTALL(FILES 
+	  "${PROJECT_SOURCE_DIR}/mk/linux/megaglest.png"
+	  DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
+
 	# Installation of data files from outside normal data folder
 	INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/source/masterserver/flags" 
 	  DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH}data/core/misc_textures
diff --git a/source/glest_map_editor/CMakeLists.txt b/source/glest_map_editor/CMakeLists.txt
index 37165393..ea12a0ad 100644
--- a/source/glest_map_editor/CMakeLists.txt
+++ b/source/glest_map_editor/CMakeLists.txt
@@ -134,4 +134,10 @@ IF(NOT CMAKE_INSTALL_PREFIX STREQUAL "")
 	  "${PROJECT_SOURCE_DIR}/mk/linux/glestkeys.ini"
           "${PROJECT_SOURCE_DIR}/data/glest_game/editor.ico"
 	  DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
+
+	# Installation of the program desktop icon file
+	INSTALL(FILES 
+	  "${PROJECT_SOURCE_DIR}/data/glest_game/editor.ico"
+	  DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
+
 ENDIF()