diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d9e3735..c4293d53 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -106,6 +106,7 @@ option( BUILD_KRDC "Build krdc" ${BUILD_ALL} )
 option( BUILD_KRFB "Build krfb" ${BUILD_ALL} )
 option( BUILD_KSIRC "Build ksirc" ${BUILD_ALL} )
 option( BUILD_KTALKD "Build ktalkd" ${BUILD_ALL} )
+option( BUILD_LANBROWSING "Build lanbrowsing" ${BUILD_ALL} )
 option( BUILD_LIBRSS "Build librss" ${BUILD_ALL} )
 
 
@@ -142,6 +143,7 @@ tde_conditional_add_subdirectory( BUILD_KRDC krdc )
 tde_conditional_add_subdirectory( BUILD_KRFB krfb )
 tde_conditional_add_subdirectory( BUILD_KSIRC ksirc )
 tde_conditional_add_subdirectory( BUILD_KTALKD ktalkd )
+tde_conditional_add_subdirectory( BUILD_LANBROWSING lanbrowsing )
 tde_conditional_add_subdirectory( BUILD_LIBRSS librss )
 
 
diff --git a/lanbrowsing/CMakeLists.txt b/lanbrowsing/CMakeLists.txt
new file mode 100644
index 00000000..146cdefe
--- /dev/null
+++ b/lanbrowsing/CMakeLists.txt
@@ -0,0 +1,14 @@
+#################################################
+#
+#  (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( lisa )
+add_subdirectory( kcmlisa )
+add_subdirectory( kio_lan )
diff --git a/lanbrowsing/kcmlisa/CMakeLists.txt b/lanbrowsing/kcmlisa/CMakeLists.txt
new file mode 100644
index 00000000..fe01dbc2
--- /dev/null
+++ b/lanbrowsing/kcmlisa/CMakeLists.txt
@@ -0,0 +1,39 @@
+#################################################
+#
+#  (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_BINARY_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+##### other data ################################
+
+install( FILES
+    kcmkiolan.desktop kcmlisa.desktop kcmreslisa.desktop
+  DESTINATION ${APPS_INSTALL_DIR}/.hidden )
+
+
+##### kcm_lanbrowser (module) ###################
+
+tde_add_kpart( kcm_lanbrowser AUTOMOC
+  SOURCES
+    main.cpp setupwizard.cpp kcmlisa.cpp kcmreslisa.cpp kcmkiolan.cpp
+    portsettingsbar.cpp findnic.cpp
+  LINK kdeui-shared
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
diff --git a/lanbrowsing/kio_lan/CMakeLists.txt b/lanbrowsing/kio_lan/CMakeLists.txt
new file mode 100644
index 00000000..d3a117f3
--- /dev/null
+++ b/lanbrowsing/kio_lan/CMakeLists.txt
@@ -0,0 +1,48 @@
+#################################################
+#
+#  (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_BINARY_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+##### other data ################################
+
+install( FILES
+    lan.protocol rlan.protocol
+  DESTINATION ${SERVICES_INSTALL_DIR} )
+
+install( FILES
+    lan.desktop
+  DESTINATION ${DATA_INSTALL_DIR}/konqueror/dirtree/remote )
+
+install( FILES
+    lan.desktop
+  DESTINATION ${DATA_INSTALL_DIR}/remoteview )
+
+install( FILES
+    lisa.desktop
+  DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/virtual_folders/services )
+
+
+##### kio_lan (module) ##########################
+
+tde_add_kpart( kio_lan
+  SOURCES kio_lan.cpp
+  LINK kio-shared
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
diff --git a/lanbrowsing/lisa/CMakeLists.txt b/lanbrowsing/lisa/CMakeLists.txt
new file mode 100644
index 00000000..c3f828a7
--- /dev/null
+++ b/lanbrowsing/lisa/CMakeLists.txt
@@ -0,0 +1,49 @@
+#################################################
+#
+#  (C) 2010-2011 Serghei Amelian
+#  serghei (DOT) amelian (AT) gmail.com
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+add_definitions( -fno-rtti -fno-exceptions )
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+
+##### other data ################################
+
+install( FILES README DESTINATION ${DATA_INSTALL_DIR}/lisa )
+
+
+##### lisa (executable) #########################
+
+tde_add_executable( lisa
+  SOURCES main.cpp
+  LINK lisa-static
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### reslisa (executable) ######################
+
+tde_add_executable( reslisa
+  SOURCES strictmain.cpp
+  LINK lisa-static
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### lisa (static) #############################
+
+tde_add_library( lisa STATIC
+  SOURCES
+    addressvalidator.cpp netmanager.cpp netscanner.cpp ipaddress.cpp
+    mystring.cpp client.cpp configfile.cpp
+)