diff -up marble-15.08.0/CMakeLists.txt.app_versions marble-15.08.0/CMakeLists.txt
--- marble-15.08.0/CMakeLists.txt.app_versions	2015-08-12 06:14:02.000000000 -0500
+++ marble-15.08.0/CMakeLists.txt	2015-08-30 14:20:32.893896711 -0500
@@ -40,7 +40,8 @@ include( MarbleMacros )
 ####################################################
 # Generate the tiles with the tilecreator at compile time
 # if this option is set, srtm.jpg will not be installed but the generated tiles instead
-option(MOBILE "Create a Marble version optimized for handheld devices")
+option(MOBILE "Create a Marble version optimized for handheld devices" ON)
+option(TOUCH  "Create a Marble version optimized for meego/touch devices" OFF)
 
 ####################################################
 # Specific options for building with Qt 4 vs 5
diff -up marble-15.08.0/data/CMakeLists.txt.app_versions marble-15.08.0/data/CMakeLists.txt
--- marble-15.08.0/data/CMakeLists.txt.app_versions	2015-08-12 06:14:02.000000000 -0500
+++ marble-15.08.0/data/CMakeLists.txt	2015-08-30 14:20:32.893896711 -0500
@@ -271,11 +271,11 @@ placemarks/boundaryplacemarks.cache
 placemarks/moonterrain.cache
 DESTINATION ${MARBLE_DATA_INSTALL_PATH}/placemarks)
 
-if(MOBILE)
-    install (FILES placemarks/cityplacemarks_large_population.cache DESTINATION ${MARBLE_DATA_INSTALL_PATH}/placemarks RENAME placemarks/cityplacemarks.cache)
-else(MOBILE)
+#if(MOBILE)
+#    install (FILES placemarks/cityplacemarks_large_population.cache DESTINATION ${MARBLE_DATA_INSTALL_PATH}/placemarks RENAME placemarks/cityplacemarks.cache)
+#else(MOBILE)
     install (FILES placemarks/cityplacemarks.cache DESTINATION ${MARBLE_DATA_INSTALL_PATH}/placemarks)
-endif(MOBILE)
+#endif(MOBILE)
 
 if(NOT APPLE AND NOT WIN32)
   install (FILES icons/128-apps-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/128x128/apps/ RENAME marble.png)
diff -up marble-15.08.0/src/apps/CMakeLists.txt.app_versions marble-15.08.0/src/apps/CMakeLists.txt
--- marble-15.08.0/src/apps/CMakeLists.txt.app_versions	2015-08-12 06:14:02.000000000 -0500
+++ marble-15.08.0/src/apps/CMakeLists.txt	2015-08-30 14:20:53.676049331 -0500
@@ -1,11 +1,13 @@
 if (NOT ANDROID)
     add_subdirectory(marble-ui)
     add_subdirectory(marble-qt)
+if ( MOBILE )
     add_subdirectory(marble-mobile)
+endif()
     add_subdirectory(marble-kde)
-    if( QT_QTDECLARATIVE_FOUND OR Qt5Quick_FOUND )
+    if( TOUCH AND (QT_QTDECLARATIVE_FOUND OR Qt5Quick_FOUND) )
         add_subdirectory(marble-touch)
-    endif( QT_QTDECLARATIVE_FOUND OR Qt5Quick_FOUND )
+    endif()
 else()
     add_subdirectory(marble_maps)
 endif()