diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 88f80425..198bbe2d 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -7,8 +7,6 @@ set_package_properties(PAM PROPERTIES DESCRIPTION "PAM Libraries"
 include(CheckTypeSize)
 include(FindPkgConfig)
 
-macro_optional_find_package(XKB) # kxkb, kdm
-
 if (PAM_FOUND)
     set(KDE4_COMMON_PAM_SERVICE "kde" CACHE STRING "The PAM service to use unless overridden for a particular app.")
 
@@ -78,6 +76,7 @@ macro_bool_to_01(X11_Xcomposite_FOUND HAVE_XCOMPOSITE) # kicker, kwin
 macro_bool_to_01(X11_Xcursor_FOUND HAVE_XCURSOR) # many uses
 macro_bool_to_01(X11_Xdamage_FOUND HAVE_XDAMAGE) # kwin
 macro_bool_to_01(X11_Xfixes_FOUND HAVE_XFIXES) # klipper, kicker, kwin
+macro_bool_to_01(X11_Xkb_FOUND HAVE_XKB) # kdm, kglobalaccel, kcontrol/keyboard
 if(WITH_XINERAMA)
     macro_bool_to_01(X11_Xinerama_FOUND HAVE_XINERAMA)
 else(WITH_XINERAMA)
diff --git a/kglobalaccel/CMakeLists.txt b/kglobalaccel/CMakeLists.txt
index 0fc97077..76abb26c 100644
--- a/kglobalaccel/CMakeLists.txt
+++ b/kglobalaccel/CMakeLists.txt
@@ -5,10 +5,6 @@ project(kglobalaccel)
 
 include_directories(${KDE4_KDEUI_INCLUDES})
 
-if(X11_Xkb_FOUND)
-    SET(HAVE_XKB TRUE)
-endif()
-
 configure_file(
     ${CMAKE_CURRENT_SOURCE_DIR}/config-kglobalaccel.h.cmake
     ${CMAKE_CURRENT_BINARY_DIR}/config-kglobalaccel.h