diff --git a/CMakeLists.txt b/CMakeLists.txt
index 621d39c3..a99e6147 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -101,6 +101,7 @@ option( BUILD_KNEWSTICKER "Build knewsticker" ${BUILD_ALL} )
 option( BUILD_KOPETE "Build kopete" ${BUILD_ALL} )
 option( BUILD_KPF "Build kpf" ${BUILD_ALL} )
 option( BUILD_KPPP "Build kppp" ${BUILD_ALL} )
+option( BUILD_KRDC "Build krdc" ${BUILD_ALL} )
 option( BUILD_LIBRSS "Build librss" ${BUILD_ALL} )
 
 
@@ -133,6 +134,7 @@ tde_conditional_add_subdirectory( BUILD_KNEWSTICKER knewsticker )
 tde_conditional_add_subdirectory( BUILD_KOPETE kopete )
 tde_conditional_add_subdirectory( BUILD_KPF kpf )
 tde_conditional_add_subdirectory( BUILD_KPPP kppp )
+tde_conditional_add_subdirectory( BUILD_KRDC krdc )
 tde_conditional_add_subdirectory( BUILD_LIBRSS librss )
 
 
diff --git a/config.h.cmake b/config.h.cmake
index e5d3c773..a9cf2d87 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -1,3 +1,6 @@
+// krdp
+#define VERSION "@VERSION@"
+
 // NOTE:
 // this definition is safe for modern Linux systems
 // for other OSes can be necessary to check
diff --git a/krdc/CMakeLists.txt b/krdc/CMakeLists.txt
new file mode 100644
index 00000000..c307684a
--- /dev/null
+++ b/krdc/CMakeLists.txt
@@ -0,0 +1,65 @@
+#################################################
+#
+#  (C) 2010-2011 Serghei Amelian
+#  serghei (DOT) amelian (AT) gmail.com
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+add_subdirectory( vnc )
+add_subdirectory( rdp )
+
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+##### other data ################################
+
+tde_install_icons( krdc )
+
+install( FILES
+    pointcursor.png pointcursormask.png pinup.png pindown.png
+    iconify.png close.png
+  DESTINATION ${DATA_INSTALL_DIR}/krdc/pics )
+
+install( FILES
+    _rfb._tcp
+  DESTINATION ${DATA_INSTALL_DIR}/zeroconf )
+
+install( FILES
+    krdc.desktop
+  DESTINATION ${XDG_APPS_INSTALL_DIR} )
+
+install( FILES
+    smb2rdc.desktop
+  DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus )
+
+install( FILES
+    vnc.protocol rdp.protocol
+  DESTINATION ${SERVICES_INSTALL_DIR} )
+
+
+##### krdc (executable) #########################
+
+tde_add_executable( krdc AUTOMOC
+  SOURCES
+    main.cpp krdc.cpp vidmode.cpp kfullscreenpanel.cpp hostprofiles.ui
+    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 kdeui-shared kdnssd-shared kwalletclient-shared
+  DESTINATION ${BIN_INSTALL_DIR}
+)
diff --git a/krdc/rdp/CMakeLists.txt b/krdc/rdp/CMakeLists.txt
new file mode 100644
index 00000000..4cda14bc
--- /dev/null
+++ b/krdc/rdp/CMakeLists.txt
@@ -0,0 +1,24 @@
+#################################################
+#
+#  (C) 2010-2011 Serghei Amelian
+#  serghei (DOT) amelian (AT) gmail.com
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/..
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+
+##### rdp (static) ##############################
+
+tde_add_library( rdp STATIC_PIC AUTOMOC
+  SOURCES krdpview.cpp rdphostpref.cpp rdpprefs.ui
+)
diff --git a/krdc/vnc/CMakeLists.txt b/krdc/vnc/CMakeLists.txt
new file mode 100644
index 00000000..60f1c8f1
--- /dev/null
+++ b/krdc/vnc/CMakeLists.txt
@@ -0,0 +1,27 @@
+#################################################
+#
+#  (C) 2010-2011 Serghei Amelian
+#  serghei (DOT) amelian (AT) gmail.com
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/..
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+
+##### vnc (static) ##############################
+
+tde_add_library( vnc STATIC_PIC AUTOMOC
+  SOURCES
+    kvncview.cpp threads.cpp colour.c d3des.c desktop.c rfbproto.c sockets.c
+    vncauth.c vncprefs.ui vnchostpref.cpp
+)