diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1756d4487..939814f1e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,6 +49,7 @@ option( WITH_SAMBA "Enable SAMBA support" OFF )
 option( WITH_OPENEXR "Enable openexr support" OFF )
 option( WITH_XCOMPOSITE "Enable xcomposite support" OFF )
 option( WITH_XCURSOR "Enable xcursor support" OFF )
+option( WITH_XFIXES "Enable xfixes support" OFF )
 option( WITH_XRANDR "Enable xrandr support" OFF )
 option( WITH_LIBUSB "Enable control of some mouse models through libusb" OFF )
 option( WITH_LIBRAW1394 "Enable visualization of ieee1394 devices through libraw1394" OFF )
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 0533a21a7..21126547e 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -54,7 +54,6 @@ endif( )
 
 
 # xcursor (kioslave, kcontrol)
-
 if( WITH_XCURSOR )
   pkg_search_module( XCURSOR xcursor )
   if( XCURSOR_FOUND )
@@ -65,6 +64,17 @@ if( WITH_XCURSOR )
 endif( )
 
 
+# xfixes (klipper)
+if( WITH_XFIXES )
+  pkg_search_module( XFIXES xfixes )
+  if( XFIXES_FOUND )
+    set( HAVE_XFIXES 1 CACHE INTERNAL "" FORCE )
+  else( )
+    tde_message_fatal( "xfixes are requested, but not found on your system" )
+  endif( )
+endif( )
+
+
 # GL
 if( BUILD_KDESKTOP OR BUILD_KCONTROL OR BUILD_KSCREENSAVER )
 check_library_exists( GL glXChooseVisual "" HAVE_GLXCHOOSEVISUAL )
diff --git a/config.h.cmake b/config.h.cmake
index 13d0cfb93..d7e2b4dd6 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -6,6 +6,9 @@
 // kdesktop, konsole, kcontrol, kicker
 #cmakedefine HAVE_XRENDER 1
 
+// taskmanager, klipper
+#cmakedefine HAVE_XFIXES 1
+
 // kdesktop, kcontrol, ksplashml
 #cmakedefine HAVE_XCURSOR 1
 
@@ -43,7 +46,6 @@
 
 // taskmanager
 #cmakedefine HAVE_XCOMPOSITE
-#cmakedefine HAVE_XFIXES
 
 // kcontrol/fonts
 #cmakedefine HAVE_FONTCONFIG 1
diff --git a/klipper/CMakeLists.txt b/klipper/CMakeLists.txt
index 7016ae236..f9a9ceafa 100644
--- a/klipper/CMakeLists.txt
+++ b/klipper/CMakeLists.txt
@@ -59,5 +59,5 @@ tde_add_library( klipper_common STATIC_PIC AUTOMOC
     toplevel.skel clipboardpoll.cpp history.cpp historyitem.cpp
     historystringitem.cpp klipperpopup.cpp popupproxy.cpp
     historyimageitem.cpp historyurlitem.cpp
-  LINK kio-shared
+  LINK kio-shared ${XFIXES_LIBRARIES}
 )