diff --git a/mk/linux/mg-version.sh b/mk/linux/mg-version.sh
index f80dc7b5..f111c36e 100755
--- a/mk/linux/mg-version.sh
+++ b/mk/linux/mg-version.sh
@@ -5,7 +5,8 @@
 # Copyright (c) 2011 Mark Vejvoda under GNU GPL v3.0+
 
 OLD_MG_VERSION=3.6.0.1
-MG_VERSION=3.6.1-dev
+#MG_VERSION=3.6.1-dev
+MG_VERSION=3.6.0.2
 
 if [ "$1" = "--oldversion" ]; then
   echo "$OLD_MG_VERSION"
diff --git a/source/g3d_viewer/CMakeLists.txt b/source/g3d_viewer/CMakeLists.txt
index 289fb3a7..3c60be17 100644
--- a/source/g3d_viewer/CMakeLists.txt
+++ b/source/g3d_viewer/CMakeLists.txt
@@ -154,18 +154,11 @@ IF(NOT CMAKE_INSTALL_PREFIX STREQUAL "")
 		${TARGET_NAME} 
 		DESTINATION ${MEGAGLEST_BIN_INSTALL_PATH})
 
-	# Check if we are running from an SVN folder structure or tarballs
-	IF(EXISTS "${PROJECT_SOURCE_DIR}/mk/linux/megaglest.desktop")
+	IF(EXISTS "${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME_MANPAGE}")
 		# Installation of the program manpage file
 		INSTALL(FILES 
-		  "${PROJECT_SOURCE_DIR}/mk/linux/${TARGET_NAME_MANPAGE}"
+		  "${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME_MANPAGE}"
 		  DESTINATION ${MEGAGLEST_MANPAGE_INSTALL_PATH})
-	ELSE()
-		# Installation of the program manpage file
-		INSTALL(FILES 
-		  "${PROJECT_SOURCE_DIR}/${TARGET_NAME_MANPAGE}"
-		  DESTINATION ${MEGAGLEST_MANPAGE_INSTALL_PATH})
-
 	ENDIF()
 
 	# Installation of the program config and image files
diff --git a/source/glest_game/CMakeLists.txt b/source/glest_game/CMakeLists.txt
index 43808756..22b04b6b 100644
--- a/source/glest_game/CMakeLists.txt
+++ b/source/glest_game/CMakeLists.txt
@@ -234,6 +234,13 @@ IF(NOT CMAKE_INSTALL_PREFIX STREQUAL "")
 		${TARGET_NAME} 
 		DESTINATION ${MEGAGLEST_BIN_INSTALL_PATH})
 
+	IF(EXISTS "${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME_MANPAGE}")
+		# Installation of the program manpage file
+		INSTALL(FILES 
+		  "${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME_MANPAGE}"
+		  DESTINATION ${MEGAGLEST_MANPAGE_INSTALL_PATH})
+	ENDIF()
+
 	# Check if we are running from an SVN folder structure or tarballs
 	IF(EXISTS "${PROJECT_SOURCE_DIR}/mk/linux/megaglest.desktop")
 		MESSAGE(STATUS "**Source package detected svn folder structure.")
@@ -252,12 +259,6 @@ IF(NOT CMAKE_INSTALL_PREFIX STREQUAL "")
 		  "${PROJECT_SOURCE_DIR}/mk/linux/glest.ico"
 		  "${PROJECT_SOURCE_DIR}/data/glest_game/g3dviewer.ico"
 		  DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
-
-		# Installation of the program manpage file
-		INSTALL(FILES 
-		  "${PROJECT_SOURCE_DIR}/mk/linux/${TARGET_NAME_MANPAGE}"
-		  DESTINATION ${MEGAGLEST_MANPAGE_INSTALL_PATH})
-
 	ELSE()
 
 		# Installation of the program desktop file
@@ -274,11 +275,5 @@ IF(NOT CMAKE_INSTALL_PREFIX STREQUAL "")
 		  "${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}/${TARGET_NAME_MANPAGE}"
-		  DESTINATION ${MEGAGLEST_MANPAGE_INSTALL_PATH})
-
 	ENDIF()
 ENDIF()
diff --git a/source/glest_map_editor/CMakeLists.txt b/source/glest_map_editor/CMakeLists.txt
index 28347b9a..18cfb1bb 100644
--- a/source/glest_map_editor/CMakeLists.txt
+++ b/source/glest_map_editor/CMakeLists.txt
@@ -149,18 +149,11 @@ IF(NOT CMAKE_INSTALL_PREFIX STREQUAL "")
 		${TARGET_NAME} 
 		DESTINATION ${MEGAGLEST_BIN_INSTALL_PATH})
 
-	# Check if we are running from an SVN folder structure or tarballs
-	IF(EXISTS "${PROJECT_SOURCE_DIR}/mk/linux/megaglest.desktop")
+	IF(EXISTS "${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME_MANPAGE}")
 		# Installation of the program manpage file
 		INSTALL(FILES 
-		  "${PROJECT_SOURCE_DIR}/mk/linux/${TARGET_NAME_MANPAGE}"
+		  "${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME_MANPAGE}"
 		  DESTINATION ${MEGAGLEST_MANPAGE_INSTALL_PATH})
-	ELSE()
-		# Installation of the program manpage file
-		INSTALL(FILES 
-		  "${PROJECT_SOURCE_DIR}/${TARGET_NAME_MANPAGE}"
-		  DESTINATION ${MEGAGLEST_MANPAGE_INSTALL_PATH})
-
 	ENDIF()
 
 	# Installation of the program config and image files