diff --git a/CMakeLists.txt b/CMakeLists.txt
index 606361fa..5d68fa52 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,6 +49,7 @@ option( WITH_SPEEX "Enable speex support (for jingle)" OFF )
 option( WITH_WEBCAM "Enable webcam support (kopete/msn)" OFF )
 option( WITH_GSM "Enable GSM SMS support (kopete/sms)" OFF )
 option( WITH_ARTS "Enable aRts support" OFF )
+option( WITH_SLP "Enable OpenSLP support (krdc, krfb)" OFF )
 
 
 ##### kopete protocols ##########################
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 9ecdb141..ce92731a 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -30,3 +30,12 @@ endif( )
 # required stuff
 find_package( TQt )
 find_package( TDE )
+
+if( WITH_SLP )
+  check_library_exists( slp "SLPOpen" "" HAVE_SLP )
+  if( HAVE_SLP )
+    set(LIB_SLP slp )
+  else( )
+    tde_message_fatal( "openslp is required, but was not found on your system" )
+  endif( )
+endif( )
diff --git a/config.h.cmake b/config.h.cmake
index 982dd208..d7f383d4 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -21,6 +21,9 @@
 #cmakedefine HAVE_SYS_PARAM_H 1
 #cmakedefine HAVE_NET_IF_PPP_H 1
 
+// krcd / krfb
+#cmakedefine HAVE_SLP 1
+
 // ktalkd
 #cmakedefine HAVE_SYS_TYPES_H 1
 #cmakedefine HAVE_SYS_STAT_H 1
diff --git a/krdc/CMakeLists.txt b/krdc/CMakeLists.txt
index 22869a0b..53dc852b 100644
--- a/krdc/CMakeLists.txt
+++ b/krdc/CMakeLists.txt
@@ -60,6 +60,6 @@ tde_add_executable( krdc AUTOMOC
     maindialogbase.ui keycapturewidget.ui kservicelocator.cpp
     keycapturedialog.cpp kremoteview.cpp smartptr.cpp hostpreferences.cpp
     preferencesdialog.cpp maindialogwidget.cpp maindialog.cpp
-  LINK vnc-static rdp-static tdeui-shared kdnssd-shared kwalletclient-shared jpeg Xext
+  LINK vnc-static rdp-static tdeui-shared kdnssd-shared kwalletclient-shared jpeg Xext ${LIB_SLP}
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/krfb/srvloc/CMakeLists.txt b/krfb/srvloc/CMakeLists.txt
index 095bcf54..a6b77211 100644
--- a/krfb/srvloc/CMakeLists.txt
+++ b/krfb/srvloc/CMakeLists.txt
@@ -24,4 +24,6 @@ tde_add_library( srvloc STATIC_PIC AUTOMOC
   SOURCES
     kserviceregistry.cpp uuid.cpp kinetinterface.cpp
     kinetinterfacewatcher.cpp getifaddrs.cpp
+  LINK
+    ${LIB_SLP}
 )