diff --git a/source/g3d_viewer/CMakeLists.txt b/source/g3d_viewer/CMakeLists.txt
index 09c98d57..a399bb67 100644
--- a/source/g3d_viewer/CMakeLists.txt
+++ b/source/g3d_viewer/CMakeLists.txt
@@ -125,12 +125,14 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER)
 			ENDIF(APPLE)
 	ENDFOREACH(DIR)
 	
-
-	IF(UNIX AND NOT APPLE)
-		SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/mk/linux)
-	ELSE()
-		SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/data/glest_game)
-	ENDIF()
+        OPTION(WANT_DEV_OUTPATH "use developer friendly output paths" OFF)
+        IF(WANT_DEV_OUTPATH)
+	        IF(UNIX AND NOT APPLE)
+		        SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/mk/linux)
+	        ELSE()
+		        SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/data/glest_game)
+	        ENDIF()
+        ENDIF()
 
 	FIND_PROGRAM(HELP2MAN "help2man")
 
diff --git a/source/glest_game/CMakeLists.txt b/source/glest_game/CMakeLists.txt
index fbb9ea2a..86ed3810 100644
--- a/source/glest_game/CMakeLists.txt
+++ b/source/glest_game/CMakeLists.txt
@@ -213,11 +213,14 @@ IF(BUILD_MEGAGLEST)
 
 	ENDIF()
 
-	IF(UNIX AND NOT APPLE)
-		SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/mk/linux)
-	ELSE()
-		SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/data/glest_game)
-	ENDIF()
+        OPTION(WANT_DEV_OUTPATH "use developer friendly output paths" OFF)
+        IF(WANT_DEV_OUTPATH)
+	        IF(UNIX AND NOT APPLE)
+		        SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/mk/linux)
+	        ELSE()
+		        SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/data/glest_game)
+	        ENDIF()
+        ENDIF()
 
 	SET_SOURCE_FILES_PROPERTIES(${MG_INCLUDE_FILES} PROPERTIES HEADER_FILE_ONLY 1)
 
@@ -259,18 +262,6 @@ IF(BUILD_MEGAGLEST)
 
         # 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")
-		        # rename the binary for installation
-	        #	MESSAGE(STATUS "Copying [${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME}] to [${CMAKE_INSTALL_PREFIX}/${MEGAGLEST_BIN_INSTALL_PATH}/megaglest]")
-	        #	install(CODE 
-	        #		"EXECUTE_PROCESS(COMMAND \"cmake\" \"-E\" \"copy\" \"${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME}\" \"${CMAKE_INSTALL_PREFIX}/${MEGAGLEST_BIN_INSTALL_PATH}/megaglest\")")
-
-	        #	install(CODE 
-	        #		"EXECUTE_PROCESS(COMMAND \"chmod\" \"+x\" \"${CMAKE_INSTALL_PREFIX}/${MEGAGLEST_BIN_INSTALL_PATH}/megaglest\")")
-
-	        #ELSE()
-
 	        MESSAGE(STATUS "**Source package [${PROJECT_SOURCE_DIR}]")	
 
 	        # Installation of the program
diff --git a/source/glest_map_editor/CMakeLists.txt b/source/glest_map_editor/CMakeLists.txt
index 6e5bc306..a63c5712 100644
--- a/source/glest_map_editor/CMakeLists.txt
+++ b/source/glest_map_editor/CMakeLists.txt
@@ -111,11 +111,14 @@ IF(BUILD_MEGAGLEST_MAP_EDITOR)
 			ENDIF(APPLE)
 	ENDFOREACH(DIR)
 
-	IF(UNIX AND NOT APPLE)
-		SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/mk/linux)
-	ELSE()
-		SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/data/glest_game)
-	ENDIF()
+        OPTION(WANT_DEV_OUTPATH "use developer friendly output paths" OFF)
+        IF(WANT_DEV_OUTPATH)
+	        IF(UNIX AND NOT APPLE)
+		        SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/mk/linux)
+	        ELSE()
+		        SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/data/glest_game)
+	        ENDIF()
+        ENDIF()
 
 	FIND_PROGRAM(HELP2MAN "help2man")
 
diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt
index df3a0fad..fc958b0a 100644
--- a/source/shared_lib/CMakeLists.txt
+++ b/source/shared_lib/CMakeLists.txt
@@ -152,7 +152,7 @@ option(ENABLE_FRIBIDI "Enable FriBIDi support" ON)
 		SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${PNG_LIBRARY})
 	ENDIF()
 
-        OPTION(WANT_FONTCONFIG "use the library fontconfig" ON)
+        OPTION(WANT_FONTCONFIG "use the library fontconfig" OFF)
 	IF(WANT_FONTCONFIG)
 	        FIND_PACKAGE(FontConfig)
 	        IF(FONTCONFIG_FOUND)