diff --git a/CMakeLists.txt b/CMakeLists.txt
index d49eeaed02..99b3088e80 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,6 +8,10 @@ add_subdirectory( pics )
 add_subdirectory( clients ) 
 add_subdirectory( data ) 
 
+if(X11_kompmgr_FOUND)
+   add_subdirectory(kompmgr)
+endif(X11_kompmgr_FOUND)
+
 include_directories( ${CMAKE_CURRENT_BINARY_DIR}/lib ${CMAKE_CURRENT_SOURCE_DIR}/lib )
 
 
@@ -15,7 +19,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR}/lib ${CMAKE_CURRENT_SOURCE_DIR}
 ########### next target ###############
 
 set(kwin_KDEINIT_SRCS
-   kwinadaptor.cpp
+	kwinadaptor.cpp
    workspace.cpp 
    client.cpp 
    placement.cpp 
@@ -38,14 +42,7 @@ set(kwin_KDEINIT_SRCS
    activation.cpp 
    useractions.cpp 
    geometry.cpp 
-   rules.cpp
-   composite.cpp
-   toplevel.cpp
-   unmanaged.cpp
-   scene.cpp
-   scene_basic.cpp
-   scene_xrender.cpp
-   effects.cpp )
+   rules.cpp )
 
 kde4_automoc(${kwin_KDEINIT_SRCS})
 
@@ -53,23 +50,11 @@ kde4_automoc(${kwin_KDEINIT_SRCS})
 kde4_add_kdeinit_executable( kwin ${kwin_KDEINIT_SRCS})
 
 target_link_libraries(kdeinit_kwin  ${KDE4_KDEUI_LIBS} kdecorations ${X11_LIBRARIES} ${QT_QT3SUPPORT_LIBRARY} )
-if (X11_Xcomposite_FOUND)
-  target_link_libraries(kdeinit_kwin ${X11_Xcomposite_LIB})
-endif (X11_Xcomposite_FOUND)
-if (X11_Xdamage_FOUND)
-  target_link_libraries(kdeinit_kwin ${X11_Xdamage_LIB})
-endif (X11_Xdamage_FOUND)
-if (X11_Xrender_FOUND)
-  target_link_libraries(kdeinit_kwin ${X11_Xrender_LIB})
-endif (X11_Xrender_FOUND)
-if (X11_Xfixes_FOUND)
-  target_link_libraries(kdeinit_kwin ${X11_Xfixes_LIB})
-endif (X11_Xfixes_FOUND)
 
 install(TARGETS kdeinit_kwin  DESTINATION ${LIB_INSTALL_DIR} )
 
 target_link_libraries( kwin kdeinit_kwin )
-install(TARGETS kwin DESTINATION bin)
+install(TARGETS kwin DESTINATION ${BIN_INSTALL_DIR})
 
 ########### install files ###############
 
@@ -85,7 +70,11 @@ kde4_install_icons( ${ICON_INSTALL_DIR} crystalsvg )
 
 #INCLUDES = -I$(srcdir)/lib $(all_includes)
 #
-#SUBDIRS = lib . killer kcmkwin pics clients oldheaders data
+#if include_kompmgr
+#KOMPMGR=kompmgr
+#endif
+#
+#SUBDIRS = lib . killer kcmkwin pics clients oldheaders data $(KOMPMGR)
 #
 #bin_PROGRAMS = 
 #lib_LTLIBRARIES =
diff --git a/clients/kwmtheme/cli_installer/CMakeLists.txt b/clients/kwmtheme/cli_installer/CMakeLists.txt
index d0ffdf6f56..0ef3d34711 100644
--- a/clients/kwmtheme/cli_installer/CMakeLists.txt
+++ b/clients/kwmtheme/cli_installer/CMakeLists.txt
@@ -11,7 +11,7 @@ kde4_add_executable(kwmtheme ${kwmtheme_SRCS})
 
 target_link_libraries(kwmtheme  ${KDE4_KDECORE_LIBS} )
 
-install(TARGETS kwmtheme DESTINATION bin)
+install(TARGETS kwmtheme DESTINATION ${BIN_INSTALL_DIR})
 
 
 ########### install files ###############
diff --git a/kcmkwin/kwinrules/CMakeLists.txt b/kcmkwin/kwinrules/CMakeLists.txt
index 8226605102..1c9d8c2bf0 100644
--- a/kcmkwin/kwinrules/CMakeLists.txt
+++ b/kcmkwin/kwinrules/CMakeLists.txt
@@ -17,7 +17,7 @@ target_link_libraries(kdeinit_kwin_rules_dialog  ${KDE4_KDEUI_LIBS} )
 install(TARGETS kdeinit_kwin_rules_dialog  DESTINATION ${LIB_INSTALL_DIR} )
 
 target_link_libraries( kwin_rules_dialog kdeinit_kwin_rules_dialog )
-install(TARGETS kwin_rules_dialog DESTINATION bin)
+install(TARGETS kwin_rules_dialog DESTINATION ${BIN_INSTALL_DIR})
 
 ########### next target ###############
 
diff --git a/killer/CMakeLists.txt b/killer/CMakeLists.txt
index f6b5eadeb8..07f96e10f1 100644
--- a/killer/CMakeLists.txt
+++ b/killer/CMakeLists.txt
@@ -11,7 +11,7 @@ kde4_add_executable(kwin_killer_helper ${kwin_killer_helper_SRCS})
 
 target_link_libraries(kwin_killer_helper  ${KDE4_KDEUI_LIBS} )
 
-install(TARGETS kwin_killer_helper DESTINATION bin)
+install(TARGETS kwin_killer_helper DESTINATION ${BIN_INSTALL_DIR})
 
 
 ########### install files ###############
diff --git a/kompmgr/CMakeLists.txt b/kompmgr/CMakeLists.txt
new file mode 100644
index 0000000000..c1da72edc8
--- /dev/null
+++ b/kompmgr/CMakeLists.txt
@@ -0,0 +1,30 @@
+
+
+
+########### next target ###############
+
+set(kompmgr_SRCS kompmgr.c )
+
+kde4_automoc(${kompmgr_SRCS})
+
+kde4_add_executable(kompmgr ${kompmgr_SRCS})
+
+target_link_libraries(kompmgr  ${KDE4_KDECORE_LIBS} ${X11_Xcomposite_LIB} ${X11_Xdamage_LIB} ${X11_Xfixes_LIB} ${X11_Xext_LIB} m )
+
+install(TARGETS kompmgr DESTINATION ${BIN_INSTALL_DIR})
+
+
+########### install files ###############
+
+
+
+
+
+#original Makefile.am contents follow:
+
+#bin_PROGRAMS = kompmgr
+#
+#kompmgr_SOURCES = kompmgr.c
+#kompmgr_LDADD =  $(X_LDFLAGS) $(X_RPATH) -lXcomposite -lXdamage -lXfixes $(LIB_XRENDER) $(LIB_X11) -lXext -lm
+#
+#INCLUDES = $(all_includes)