diff --git a/src/App/CMakeLists.txt b/src/App/CMakeLists.txt
index 027fcf38e..9983266a8 100644
--- a/src/App/CMakeLists.txt
+++ b/src/App/CMakeLists.txt
@@ -3,13 +3,14 @@ if(WIN32)
     add_definitions(-DBOOST_DYN_LINK)
 endif(WIN32)
 
-IF(RESOURCEDIR)
-    add_definitions(-DRESOURCEDIR="${RESOURCEDIR}")
-ENDIF(RESOURCEDIR)
+# This causes some problems with the resource files to be found, especially with the StartPage
+#IF(RESOURCEDIR)
+#    add_definitions(-DRESOURCEDIR="${RESOURCEDIR}")
+#ENDIF(RESOURCEDIR)
 
-IF(DOCDIR)
-    add_definitions(-DDOCDIR="${DOCDIR}")
-ENDIF(DOCDIR)
+#IF(DOCDIR)
+#    add_definitions(-DDOCDIR="${DOCDIR}")
+#ENDIF(DOCDIR)
 
 include_directories(
     ${CMAKE_BINARY_DIR}/src
diff --git a/src/Mod/Start/StartPage/CMakeLists.txt b/src/Mod/Start/StartPage/CMakeLists.txt
index 3678a517f..624588115 100644
--- a/src/Mod/Start/StartPage/CMakeLists.txt
+++ b/src/Mod/Start/StartPage/CMakeLists.txt
@@ -1,32 +1,32 @@
 SET(StartPage_SRCS
-	StartPage.py
-	__init__.py
+    StartPage.py
+    __init__.py
 )
 
 SET(StartPage_DATA 
-	ArchDesign.py
-	DefaultWorkbench.py
-	LoadDrawingExample.py
-	LoadPartDesignExample.py
-	LoadRobotExample.py
-	LoadSchenkel.py
-	LoadMRU0.py
-	LoadMRU1.py
-	LoadMRU2.py
-	Mesh.py
-	PartDesign.py
-	Background.jpg
-	FreeCAD.png
-	PartDesign.png
-	ArchDesign.png
-	Mesh.png
-	Complete.png
-	PartDesignExample.png
-	ArchExample.png
-	web.png
+    ArchDesign.py
+    DefaultWorkbench.py
+    LoadDrawingExample.py
+    LoadPartDesignExample.py
+    LoadRobotExample.py
+    LoadSchenkel.py
+    LoadMRU0.py
+    LoadMRU1.py
+    LoadMRU2.py
+    Mesh.py
+    PartDesign.py
+    Background.jpg
+    FreeCAD.png
+    PartDesign.png
+    ArchDesign.png
+    Mesh.png
+    Complete.png
+    PartDesignExample.png
+    ArchExample.png
+    web.png
 )
 
 INSTALL(FILES ${StartPage_SRCS} ${StartPage_DATA}
-	DESTINATION Mod/Start/StartPage
+    DESTINATION Mod/Start/StartPage
 )