diff --git a/CMakeLists.txt b/CMakeLists.txt
index 838ff6be..f18c8112 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -94,6 +94,7 @@ option( BUILD_DCOPRSS "Build dcoprss" ${BUILD_ALL} )
 option( BUILD_DOC "Build doc" ${BUILD_ALL} )
 option( BUILD_FILESHARING "Build filesharing" ${BUILD_ALL} )
 option( BUILD_KDICT "Build kdict" ${BUILD_ALL} )
+option( BUILD_KDNSSD "Build kdnssd" ${BUILD_ALL} )
 option( BUILD_KOPETE "Build kopete" ${BUILD_ALL} )
 option( BUILD_LIBRSS "Build librss" ${BUILD_ALL} )
 
@@ -120,6 +121,7 @@ tde_conditional_add_subdirectory( BUILD_DCOPRSS dcoprss )
 tde_conditional_add_subdirectory( BUILD_DOC doc )
 tde_conditional_add_subdirectory( BUILD_FILESHARING filesharing )
 tde_conditional_add_subdirectory( BUILD_KDICT kdict )
+tde_conditional_add_subdirectory( BUILD_KDNSSD kdnssd )
 tde_conditional_add_subdirectory( BUILD_KOPETE kopete )
 tde_conditional_add_subdirectory( BUILD_LIBRSS librss )
 
diff --git a/kdict/CMakeLists.txt b/kdict/CMakeLists.txt
index ffc63403..b56251aa 100644
--- a/kdict/CMakeLists.txt
+++ b/kdict/CMakeLists.txt
@@ -28,6 +28,7 @@ link_directories(
 
 ##### other data ################################
 
+tde_install_icons( )
 install( FILES kdict.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 install( FILES kdictui.rc DESTINATION ${DATA_INSTALL_DIR}/kdict )
 
diff --git a/kdnssd/CMakeLists.txt b/kdnssd/CMakeLists.txt
new file mode 100644
index 00000000..8aedd4c0
--- /dev/null
+++ b/kdnssd/CMakeLists.txt
@@ -0,0 +1,13 @@
+#################################################
+#
+#  (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( ioslave )
+add_subdirectory( kdedmodule )
diff --git a/kdnssd/ioslave/CMakeLists.txt b/kdnssd/ioslave/CMakeLists.txt
new file mode 100644
index 00000000..f999dff5
--- /dev/null
+++ b/kdnssd/ioslave/CMakeLists.txt
@@ -0,0 +1,44 @@
+#################################################
+#
+#  (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}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+##### other data ################################
+
+install( FILES
+    zeroconf.protocol invitation.protocol
+  DESTINATION ${SERVICES_INSTALL_DIR} )
+
+install( FILES
+    _http._tcp _ftp._tcp _ldap._tcp _webdav._tcp _nfs._tcp _ssh._tcp
+  DESTINATION ${DATA_INSTALL_DIR}/zeroconf )
+
+install( FILES
+    zeroconf.desktop
+  DESTINATION ${DATA_INSTALL_DIR}/remoteview )
+
+
+##### kio_zeroconf (module) #####################
+
+tde_add_kpart( kio_zeroconf AUTOMOC
+  SOURCES dnssd.cpp
+  LINK kdnssd-shared kio-shared
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
diff --git a/kdnssd/kdedmodule/CMakeLists.txt b/kdnssd/kdedmodule/CMakeLists.txt
new file mode 100644
index 00000000..5604c97a
--- /dev/null
+++ b/kdnssd/kdedmodule/CMakeLists.txt
@@ -0,0 +1,34 @@
+#################################################
+#
+#  (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}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+##### other data ################################
+
+install( FILES dnssdwatcher.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
+
+
+##### kded_dnssdwatcher (module) ################
+
+tde_add_kpart( kded_dnssdwatcher AUTOMOC
+  SOURCES dnssdwatcher.cpp dnssdwatcher.skel watcher.cpp
+  LINK kdnssd-shared kdeinit_kded-shared
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)