diff --git a/CMakeLists.txt b/CMakeLists.txt
index c735bc335..5563e0c09 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -84,6 +84,7 @@ OPTION( WITH_INOTIFY "Enable inotify support for kio" ON )
 OPTION( WITH_GAMIN "Enable FAM/GAMIN support" ${WITH_ALL_OPTIONS} )
 OPTION( WITH_SUDO_KDESU_BACKEND "Use sudo as backend for kdesu (default is su)" OFF )
 OPTION( WITH_LZMA "Enable support for LZMA/XZ" ${WITH_ALL_OPTIONS} )
+OPTION( WITH_XRANDR "Build the krandr library" ON )
 
 OPTION( WITH_ASPELL "Enable aspell support" ${WITH_ALL_OPTIONS} )
 OPTION( WITH_HSPELL "Enable hspell support" ${WITH_ALL_OPTIONS} )
@@ -575,10 +576,14 @@ endif( NOT FONTCONFIG_FOUND )
 
 ##### check for Xrandr ##########################
 
-pkg_search_module( XRANDR xrandr>=1.2 )
-if( XRANDR_FOUND )
-  set( XRANDR_SUPPORT 1 )
-endif( XRANDR_FOUND )
+if( WITH_XRANDR )
+  pkg_search_module( XRANDR xrandr>=1.2 )
+  if( XRANDR_FOUND )
+    set( XRANDR_SUPPORT 1 )
+  else( XRANDR_FOUND )
+    tde_message_fatal( "xrandr support was required, but not found on your system" )
+  endif( XRANDR_FOUND )
+endif( WITH_XRANDR )
 
 
 ##### check for xrender #########################
@@ -909,9 +914,7 @@ add_subdirectory( arts )
 add_subdirectory( interfaces )
 add_subdirectory( kate )
 add_subdirectory( kcert )
-if( XRANDR_FOUND )
-  add_subdirectory( krandr )
-endif( XRANDR_FOUND )
+tde_conditional_add_subdirectory( WITH_XRANDR krandr )
 add_subdirectory( khtml )
 add_subdirectory( kcmshell )
 add_subdirectory( kconf_update )