diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6edbed73..7e94b24c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,7 +51,8 @@ tde_setup_paths( )
 ##### user requested modules ####################
 
 option( BUILD_ALL "Build all" OFF )
-option( BUILD_QUANTA "Build Quanta" ${BUILD_ALL} )
+option( BUILD_KFILEREPLACE "Build kfilereplace" ${BUILD_ALL} )
+option( BUILD_QUANTA "Build quanta" ${BUILD_ALL} )
 
 
 ##### configure checks ##########################
@@ -73,7 +74,11 @@ set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" )
 
 ##### source directories ########################
 
-add_subdirectory( lib )
+if( BUILD_QUANTA )
+  add_subdirectory( lib )
+endif( )
+
+tde_conditional_add_subdirectory( BUILD_KFILEREPLACE kfilereplace )
 tde_conditional_add_subdirectory( BUILD_QUANTA quanta )
 
 
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 3d5b26bb..9d768326 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -10,20 +10,24 @@
 #################################################
 
 # libxml-2.0
-pkg_search_module( LIBXML libxml-2.0 )
-if( LIBXML_FOUND )
-  if( ${LIBXML_VERSION} VERSION_LESS "2.6" )
-    tde_message_fatal( "libxml-2.0 version must be at least 2.6" )
+if( BUILD_QUANTA )
+  pkg_search_module( LIBXML libxml-2.0 )
+  if( LIBXML_FOUND )
+    if( ${LIBXML_VERSION} VERSION_LESS "2.6" )
+      tde_message_fatal( "libxml-2.0 version must be at least 2.6" )
+    endif( )
+  else( )
+    tde_message_fatal( "libxml-2.0 are required, but not found on your system" )
   endif( )
-else( )
-  tde_message_fatal( "libxml-2.0 are required, but not found on your system" )
 endif( )
 
 
 # libxslt
-pkg_search_module( LIBXSLT libxslt )
-if( NOT LIBXSLT_FOUND )
-  tde_message_fatal( "libxslt are required, but not found on your system" )
+if( BUILD_QUANTA )
+  pkg_search_module( LIBXSLT libxslt )
+  if( NOT LIBXSLT_FOUND )
+    tde_message_fatal( "libxslt are required, but not found on your system" )
+  endif( )
 endif( )