diff --git a/Kommon/CMakeLists.txt b/Kommon/CMakeLists.txt
index 23459358b..a8b32607a 100644
--- a/Kommon/CMakeLists.txt
+++ b/Kommon/CMakeLists.txt
@@ -21,6 +21,9 @@ kasper_module_debug()
 # set(KOMMON_HEADER_FILES)
 # set(KOMMON_SOURCE_FILES)
 
+set( KASPER_USE_TBB OFF CACHE BOOL "Use the Intel TBB library in Kommon")
+mark_as_advanced( FORCE KASPER_USE_TBB )
+
 # subdirectories
 add_subdirectory( cmake )
 add_subdirectory( Documentation )
diff --git a/Kommon/TBB/CMakeLists.txt b/Kommon/TBB/CMakeLists.txt
index 96882ba3b..92f3ada20 100644
--- a/Kommon/TBB/CMakeLists.txt
+++ b/Kommon/TBB/CMakeLists.txt
@@ -1,19 +1,15 @@
 find_package( TBB REQUIRED )
 
 # headers
-set( KOMMON_TBB_HEADER_FILENAMES
+set( KOMMON_TBB_HEADER_FILES
     Utility/KMathIntegratorThreaded.h
 )
 
 # source
-#set( KOMMON_TBB_SOURCE_FILENAMES
+#set( KOMMON_TBB_SOURCE_FILES
 #    Utility/KMathIntegratorThreaded.cxx
 #)
 
-# propagate path variable to parent scope
-#kasper_append_paths( KOMMON_HEADER_FILES ${KOMMON_TBB_HEADER_FILENAMES} )
-#kasper_append_paths( KOMMON_SOURCE_FILES ${KOMMON_TBB_SOURCE_FILENAMES} )
-
 
 # get header paths from collected header files
 foreach(HEADER ${KOMMON_BOOST_HEADER_FILES})
@@ -29,5 +25,5 @@ target_link_libraries(KommonCore
         ${TBB_LIBRARIES}
 )
 
-kasper_install_libraries( KommonCore )
-kasper_install_headers( ${KOMMON_TBB_HEADER_FILENAMES} )
+#kasper_install_libraries( KommonCore )
+kasper_install_headers( ${KOMMON_TBB_HEADER_FILES} )