diff --git a/source/glest_game/CMakeLists.txt b/source/glest_game/CMakeLists.txt
index 2bb056eb..f3154402 100644
--- a/source/glest_game/CMakeLists.txt
+++ b/source/glest_game/CMakeLists.txt
@@ -212,24 +212,49 @@ IF(NOT CMAKE_INSTALL_PREFIX STREQUAL "")
 		${TARGET_NAME} 
 		DESTINATION ${MEGAGLEST_BIN_INSTALL_PATH})
 
-	# Installation of the program desktop file
-	INSTALL(FILES 
-	  "${PROJECT_SOURCE_DIR}/megaglest.desktop"
-	  DESTINATION ${MEGAGLEST_DESKTOP_INSTALL_PATH})
+	# Check if we are running from an SVN folder structure or tarballs
+	IF(EXISTS "${PROJECT_SOURCE_DIR}/../glest_game/")
+		MESSAGE(STATUS "**Source package detected svn folder structure.")
 
-	# Installation of the program desktop icon file
-	INSTALL(FILES 
-	  "${PROJECT_SOURCE_DIR}/megaglest.png"
-          "${PROJECT_SOURCE_DIR}/megaglest.bmp"
-          "${PROJECT_SOURCE_DIR}/editor.ico"
-          "${PROJECT_SOURCE_DIR}/glest.ico"
-          "${PROJECT_SOURCE_DIR}/g3dviewer.ico"
-	  DESTINATION ${MEGAGLEST_ICON_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 manpage file
-	INSTALL(FILES 
-	  "${PROJECT_SOURCE_DIR}/megaglest.6"
-	  DESTINATION ${MEGAGLEST_MANPAGE_INSTALL_PATH})
+		# Installation of the program desktop icon file
+		INSTALL(FILES 
+		  "${PROJECT_SOURCE_DIR}/../../mk/linux/megaglest.png"
+		  "${PROJECT_SOURCE_DIR}/../../mk/linux/megaglest.bmp"
+		  "${PROJECT_SOURCE_DIR}/../../data/glest_game/editor.ico"
+		  "${PROJECT_SOURCE_DIR}/../../mk/linux/glest.ico"
+		  "${PROJECT_SOURCE_DIR}/../../data/glest_game/g3dviewer.ico"
+		  DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
 
-	#ENDIF()
+		# Installation of the program manpage file
+		INSTALL(FILES 
+		  "${PROJECT_SOURCE_DIR}/../../mk/linux/megaglest.6"
+		  DESTINATION ${MEGAGLEST_MANPAGE_INSTALL_PATH})
+
+	ELSE()
+
+		# Installation of the program desktop file
+		INSTALL(FILES 
+		  "${PROJECT_SOURCE_DIR}/megaglest.desktop"
+		  DESTINATION ${MEGAGLEST_DESKTOP_INSTALL_PATH})
+
+		# Installation of the program desktop icon file
+		INSTALL(FILES 
+		  "${PROJECT_SOURCE_DIR}/megaglest.png"
+		  "${PROJECT_SOURCE_DIR}/megaglest.bmp"
+		  "${PROJECT_SOURCE_DIR}/editor.ico"
+		  "${PROJECT_SOURCE_DIR}/glest.ico"
+		  "${PROJECT_SOURCE_DIR}/g3dviewer.ico"
+		  DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
+
+		# Installation of the program manpage file
+		INSTALL(FILES 
+		  "${PROJECT_SOURCE_DIR}/megaglest.6"
+		  DESTINATION ${MEGAGLEST_MANPAGE_INSTALL_PATH})
+
+	ENDIF()
 ENDIF()