diff --git a/CMakeLists.txt b/CMakeLists.txt
index c59b22e2e..faaef18e9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -108,6 +108,9 @@ option(WITH_X11 "Build X11/X.Org support" ON)
 add_feature_info(x11 WITH_X11 "an open source something")
 
 # katie features
+option(KATIE_BOOTSTRAP "Build only core tools" OFF)
+add_feature_info(bootstrap KATIE_BOOTSTRAP "")
+
 option(WITH_OPENGLES1 "Build opengles1 support" OFF)
 add_feature_info(opengles1 WITH_OPENGLES1 "an open source something")
 
@@ -459,36 +462,38 @@ endif()
 
 # major components
 add_subdirectory(src/core)
-if(WITH_DBUS AND DBUS_FOUND)
-    add_subdirectory(src/dbus)
-else()
-    katie_definition(-DQT_NO_DBUS)
-endif()
-add_subdirectory(src/declarative)
-add_subdirectory(src/designer)
-add_subdirectory(src/gui)
-add_subdirectory(src/help)
-add_subdirectory(src/imports)
-add_subdirectory(src/multimedia)
-add_subdirectory(src/network)
-if(WITH_OPENGL AND OPENGL_FOUND)
-    add_subdirectory(src/opengl)
-else()
-    katie_definition(-DQT_NO_OPENGL)
-endif()
-add_subdirectory(src/phonon)
-add_subdirectory(src/plugins)
-add_subdirectory(src/script)
-add_subdirectory(src/scripttools)
-add_subdirectory(src/sql)
-add_subdirectory(src/svg)
-add_subdirectory(src/test)
-add_subdirectory(src/uitools)
-if(KATIE_PLATFORM MATCHES "(win32|wince)")
-    add_subdirectory(src/winmain)
-endif()
 add_subdirectory(src/xml)
-add_subdirectory(src/xmlpatterns)
+if(NOT KATIE_BOOTSTRAP)
+    if(WITH_DBUS AND DBUS_FOUND)
+        add_subdirectory(src/dbus)
+    else()
+        katie_definition(-DQT_NO_DBUS)
+    endif()
+    add_subdirectory(src/declarative)
+    add_subdirectory(src/designer)
+    add_subdirectory(src/gui)
+    add_subdirectory(src/help)
+    add_subdirectory(src/imports)
+    add_subdirectory(src/multimedia)
+    add_subdirectory(src/network)
+    if(WITH_OPENGL AND OPENGL_FOUND)
+        add_subdirectory(src/opengl)
+    else()
+        katie_definition(-DQT_NO_OPENGL)
+    endif()
+    add_subdirectory(src/phonon)
+    add_subdirectory(src/plugins)
+    add_subdirectory(src/script)
+    add_subdirectory(src/scripttools)
+    add_subdirectory(src/sql)
+    add_subdirectory(src/svg)
+    add_subdirectory(src/test)
+    add_subdirectory(src/uitools)
+    if(KATIE_PLATFORM MATCHES "(win32|wince)")
+        add_subdirectory(src/winmain)
+    endif()
+    add_subdirectory(src/xmlpatterns)
+endif()
 add_subdirectory(src/tools)
 if(ENABLE_TESTING)
     add_subdirectory(tests)
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
index 97f343dac..ad42e97b1 100644
--- a/src/tools/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
@@ -6,12 +6,14 @@ add_subdirectory(moc)
 add_subdirectory(rcc)
 add_subdirectory(uic)
 
-# non-bootstraped
-if(WITH_DBUS AND DBUS_FOUND)
-    add_subdirectory(qdbus)
-endif()
-add_subdirectory(qhelpgenerator)
-add_subdirectory(qcollectiongenerator)
+# semi-bootstraped
 add_subdirectory(lrelease)
 add_subdirectory(lupdate)
 add_subdirectory(lconvert)
+if(NOT KATIE_BOOTSTRAP)
+    if(WITH_DBUS AND DBUS_FOUND)
+        add_subdirectory(qdbus)
+    endif()
+    add_subdirectory(qhelpgenerator)
+    add_subdirectory(qcollectiongenerator)
+endif()