diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4c07ab608..fac5bcfd8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -117,7 +117,11 @@ elseif (BUNDLE STREQUAL "wallet")
 	set(D_TESTS OFF)
 	set(D_ETHKEY ON)
 	set(D_MINER OFF)
-	set(D_ETHASHCL ON)
+	set(D_ETHASHCL OFF)
+	set(D_FATDB OFF)
+	set(D_JSONRPC OFF)
+	set(D_JSCONSOLE OFF)
+	set(D_EVMJIT OFF)
 elseif (BUNDLE STREQUAL "miner")
 	set(D_SERPENT OFF)
 	set(D_SOLIDITY OFF)
@@ -128,6 +132,10 @@ elseif (BUNDLE STREQUAL "miner")
 	set(D_ETHKEY OFF)
 	set(D_MINER ON)
 	set(D_ETHASHCL ON)
+	set(D_FATDB OFF)
+	set(D_JSONRPC OFF)
+	set(D_JSCONSOLE OFF)
+	set(D_EVMJIT OFF)
 elseif (BUNDLE STREQUAL "release")      # release builds
 	set(D_SERPENT ${DECENT_PLATFORM})
 	set(D_SOLIDITY ON)