diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1685e51aae..b93bb52b60 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,8 +7,10 @@ add_subdirectory( pics )
 add_subdirectory( clients ) 
 add_subdirectory( oldheaders ) 
 add_subdirectory( data ) 
+if(X11_kompmgr_FOUND)
+	add_subdirectory(kompmgr)
+endif(X11_kompmgr_FOUND)
 
-message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: skipped subdir $(KOMPMGR)")
 message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: Readd kcmkwin )" )
 include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}  ${CMAKE_CURRENT_BINARY_DIR}/lib)
 
diff --git a/kompmgr/CMakeLists.txt b/kompmgr/CMakeLists.txt
index 5a1ce8bc1e..48d844fbcc 100644
--- a/kompmgr/CMakeLists.txt
+++ b/kompmgr/CMakeLists.txt
@@ -11,7 +11,7 @@ kde4_automoc(${kompmgr_SRCS})
 
 kde4_add_executable(kompmgr ${kompmgr_SRCS})
 
-target_link_libraries(kompmgr  ${QT_AND_KDECORE_LIBS} Xcomposite Xdamage Xfixes Xext m )
+target_link_libraries(kompmgr  ${QT_AND_KDECORE_LIBS} ${X11_Xcomposite_LIB} ${X11_Xdamage_LIB} ${X11_Xfixes_LIB} ${X11_Xext_LIB} m )
 
 install_targets(/bin kompmgr )