diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index a8b8de4bc..0a2a98313 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,12 +1,30 @@
-#################################################
-#
-#  (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( man )
 
-tde_auto_add_subdirectories()
+tde_conditional_add_subdirectory( BUILD_KAPPFINDER kappfinder )
+tde_conditional_add_subdirectory( BUILD_KATE kate )
+tde_conditional_add_subdirectory( BUILD_KCONTROL kcontrol )
+tde_conditional_add_subdirectory( BUILD_KDCOP kdcop )
+tde_conditional_add_subdirectory( BUILD_KONQUEROR keditbookmarks )
+tde_conditional_add_subdirectory( BUILD_KFIND kfind )
+tde_conditional_add_subdirectory( BUILD_KHELPCENTER khelpcenter )
+tde_conditional_add_subdirectory( BUILD_KICKER kicker )
+tde_conditional_add_subdirectory( BUILD_TDEPRINT kjobviewer )
+tde_conditional_add_subdirectory( BUILD_KLIPPER klipper )
+tde_conditional_add_subdirectory( BUILD_KMENUEDIT kmenuedit )
+tde_conditional_add_subdirectory( BUILD_KNETATTACH knetattach )
+tde_conditional_add_subdirectory( BUILD_TWIN kompmgr )
+tde_conditional_add_subdirectory( BUILD_KONQUEROR konqueror )
+tde_conditional_add_subdirectory( BUILD_KONSOLE konsole )
+tde_conditional_add_subdirectory( BUILD_KPAGER kpager )
+tde_conditional_add_subdirectory( BUILD_KSPLASHML ksplashml )
+tde_conditional_add_subdirectory( BUILD_KSYSGUARD ksysguard )
+tde_conditional_add_subdirectory( BUILD_KWRITE kwrite )
+tde_conditional_add_subdirectory( BUILD_KXKB kxkb )
+tde_conditional_add_subdirectory( BUILD_TDEDEBUGDIALOG tdedebugdialog )
+tde_conditional_add_subdirectory( BUILD_KCONTROL tdefontview )
+tde_conditional_add_subdirectory( BUILD_TDEIOSLAVES tdeioslave )
+tde_conditional_add_subdirectory( BUILD_TDEPASSWD tdepasswd )
+tde_conditional_add_subdirectory( BUILD_TDEPRINT tdeprint )
+tde_conditional_add_subdirectory( BUILD_TDEPRINT tdeprintfax )
+tde_conditional_add_subdirectory( BUILD_TDESU tdesu )
+tde_conditional_add_subdirectory( BUILD_TDM tdm )
diff --git a/doc/man/CMakeLists.txt b/doc/man/CMakeLists.txt
new file mode 100644
index 000000000..74cd0aefd
--- /dev/null
+++ b/doc/man/CMakeLists.txt
@@ -0,0 +1,28 @@
+tde_conditional_add_subdirectory( BUILD_DRKONQI drkonqi )
+tde_conditional_add_subdirectory( BUILD_KAPPFINDER kappfinder )
+tde_conditional_add_subdirectory( BUILD_KATE kate )
+tde_conditional_add_subdirectory( BUILD_KCHECKPASS kcheckpass )
+tde_conditional_add_subdirectory( BUILD_KCMINIT kcminit )
+tde_conditional_add_subdirectory( BUILD_KDCOP kdcop )
+tde_conditional_add_subdirectory( BUILD_KDIALOG kdialog )
+tde_conditional_add_subdirectory( BUILD_KFIND kfind )
+tde_conditional_add_subdirectory( BUILD_KHOTKEYS khotkeys )
+tde_conditional_add_subdirectory( BUILD_KICKER kicker )
+tde_conditional_add_subdirectory( BUILD_KMENUEDIT kmenuedit )
+tde_conditional_add_subdirectory( BUILD_KNETATTACH knetattach )
+tde_conditional_add_subdirectory( BUILD_KONQUEROR konqueror )
+tde_conditional_add_subdirectory( BUILD_KONSOLE konsole )
+tde_conditional_add_subdirectory( BUILD_KPAGER kpager )
+tde_conditional_add_subdirectory( BUILD_KPERSONALIZER kpersonalizer )
+tde_conditional_add_subdirectory( BUILD_KREADCONFIG kreadconfig )
+tde_conditional_add_subdirectory( BUILD_KSTART kstart )
+tde_conditional_add_subdirectory( BUILD_KSYSTRAYCMD ksystraycmd )
+tde_conditional_add_subdirectory( BUILD_KXKB kxkb )
+tde_conditional_add_subdirectory( BUILD_STARTTDE starttde )
+tde_conditional_add_subdirectory( BUILD_TDEDEBUGDIALOG tdedebugdialog )
+tde_conditional_add_subdirectory( BUILD_TDEIOSLAVES tdeioslave )
+tde_conditional_add_subdirectory( BUILD_TDEPASSWD tdepasswd )
+tde_conditional_add_subdirectory( BUILD_TDEPRINT tdeprint )
+tde_conditional_add_subdirectory( BUILD_TDESCREENSAVER tdescreensaver )
+tde_conditional_add_subdirectory( BUILD_TDESU tdesu )
+tde_conditional_add_subdirectory( BUILD_TDM tdm )
diff --git a/doc/man/drkonqi/CMakeLists.txt b/doc/man/drkonqi/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/drkonqi/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/drkonqi.1 b/doc/man/drkonqi/drkonqi.1
similarity index 100%
rename from doc/man/drkonqi.1
rename to doc/man/drkonqi/drkonqi.1
diff --git a/doc/man/kappfinder/CMakeLists.txt b/doc/man/kappfinder/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/kappfinder/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/kappfinder.1 b/doc/man/kappfinder/kappfinder.1
similarity index 100%
rename from doc/man/kappfinder.1
rename to doc/man/kappfinder/kappfinder.1
diff --git a/doc/man/kate/CMakeLists.txt b/doc/man/kate/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/kate/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/kate.1 b/doc/man/kate/kate.1
similarity index 100%
rename from doc/man/kate.1
rename to doc/man/kate/kate.1
diff --git a/doc/man/kwrite.1 b/doc/man/kate/kwrite.1
similarity index 100%
rename from doc/man/kwrite.1
rename to doc/man/kate/kwrite.1
diff --git a/doc/man/kcheckpass/CMakeLists.txt b/doc/man/kcheckpass/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/kcheckpass/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/kcheckpass.1 b/doc/man/kcheckpass/kcheckpass.1
similarity index 100%
rename from doc/man/kcheckpass.1
rename to doc/man/kcheckpass/kcheckpass.1
diff --git a/doc/man/kcminit/CMakeLists.txt b/doc/man/kcminit/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/kcminit/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/kcminit.1 b/doc/man/kcminit/kcminit.1
similarity index 100%
rename from doc/man/kcminit.1
rename to doc/man/kcminit/kcminit.1
diff --git a/doc/man/kdcop/CMakeLists.txt b/doc/man/kdcop/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/kdcop/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/kdcop.1 b/doc/man/kdcop/kdcop.1
similarity index 100%
rename from doc/man/kdcop.1
rename to doc/man/kdcop/kdcop.1
diff --git a/doc/man/kdialog/CMakeLists.txt b/doc/man/kdialog/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/kdialog/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/kdialog.1 b/doc/man/kdialog/kdialog.1
similarity index 100%
rename from doc/man/kdialog.1
rename to doc/man/kdialog/kdialog.1
diff --git a/doc/man/kfind/CMakeLists.txt b/doc/man/kfind/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/kfind/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/kfind.1 b/doc/man/kfind/kfind.1
similarity index 100%
rename from doc/man/kfind.1
rename to doc/man/kfind/kfind.1
diff --git a/doc/man/khotkeys/CMakeLists.txt b/doc/man/khotkeys/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/khotkeys/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/khotkeys.1 b/doc/man/khotkeys/khotkeys.1
similarity index 100%
rename from doc/man/khotkeys.1
rename to doc/man/khotkeys/khotkeys.1
diff --git a/doc/man/kicker/CMakeLists.txt b/doc/man/kicker/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/kicker/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/appletproxy.1 b/doc/man/kicker/appletproxy.1
similarity index 100%
rename from doc/man/appletproxy.1
rename to doc/man/kicker/appletproxy.1
diff --git a/doc/man/extensionproxy.1 b/doc/man/kicker/extensionproxy.1
similarity index 100%
rename from doc/man/extensionproxy.1
rename to doc/man/kicker/extensionproxy.1
diff --git a/doc/man/kasbar.1 b/doc/man/kicker/kasbar.1
similarity index 100%
rename from doc/man/kasbar.1
rename to doc/man/kicker/kasbar.1
diff --git a/doc/man/kicker.1 b/doc/man/kicker/kicker.1
similarity index 100%
rename from doc/man/kicker.1
rename to doc/man/kicker/kicker.1
diff --git a/doc/man/kmenuedit/CMakeLists.txt b/doc/man/kmenuedit/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/kmenuedit/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/kmenuedit.1 b/doc/man/kmenuedit/kmenuedit.1
similarity index 100%
rename from doc/man/kmenuedit.1
rename to doc/man/kmenuedit/kmenuedit.1
diff --git a/doc/man/knetattach/CMakeLists.txt b/doc/man/knetattach/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/knetattach/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/knetattach.1 b/doc/man/knetattach/knetattach.1
similarity index 100%
rename from doc/man/knetattach.1
rename to doc/man/knetattach/knetattach.1
diff --git a/doc/man/konqueror/CMakeLists.txt b/doc/man/konqueror/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/konqueror/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/keditbookmarks.1 b/doc/man/konqueror/keditbookmarks.1
similarity index 100%
rename from doc/man/keditbookmarks.1
rename to doc/man/konqueror/keditbookmarks.1
diff --git a/doc/man/kfmclient.1 b/doc/man/konqueror/kfmclient.1
similarity index 100%
rename from doc/man/kfmclient.1
rename to doc/man/konqueror/kfmclient.1
diff --git a/doc/man/konqueror.1 b/doc/man/konqueror/konqueror.1
similarity index 100%
rename from doc/man/konqueror.1
rename to doc/man/konqueror/konqueror.1
diff --git a/doc/man/konsole/CMakeLists.txt b/doc/man/konsole/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/konsole/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/konsole.1 b/doc/man/konsole/konsole.1
similarity index 100%
rename from doc/man/konsole.1
rename to doc/man/konsole/konsole.1
diff --git a/doc/man/kpager/CMakeLists.txt b/doc/man/kpager/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/kpager/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/kpager.1 b/doc/man/kpager/kpager.1
similarity index 100%
rename from doc/man/kpager.1
rename to doc/man/kpager/kpager.1
diff --git a/doc/man/kpersonalizer/CMakeLists.txt b/doc/man/kpersonalizer/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/kpersonalizer/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/kpersonalizer.1 b/doc/man/kpersonalizer/kpersonalizer.1
similarity index 100%
rename from doc/man/kpersonalizer.1
rename to doc/man/kpersonalizer/kpersonalizer.1
diff --git a/doc/man/kreadconfig/CMakeLists.txt b/doc/man/kreadconfig/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/kreadconfig/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/kreadconfig.1 b/doc/man/kreadconfig/kreadconfig.1
similarity index 100%
rename from doc/man/kreadconfig.1
rename to doc/man/kreadconfig/kreadconfig.1
diff --git a/doc/man/kwriteconfig.1 b/doc/man/kreadconfig/kwriteconfig.1
similarity index 100%
rename from doc/man/kwriteconfig.1
rename to doc/man/kreadconfig/kwriteconfig.1
diff --git a/doc/man/kstart/CMakeLists.txt b/doc/man/kstart/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/kstart/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/kstart.1 b/doc/man/kstart/kstart.1
similarity index 100%
rename from doc/man/kstart.1
rename to doc/man/kstart/kstart.1
diff --git a/doc/man/ksystraycmd/CMakeLists.txt b/doc/man/ksystraycmd/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/ksystraycmd/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/ksystraycmd.1 b/doc/man/ksystraycmd/ksystraycmd.1
similarity index 100%
rename from doc/man/ksystraycmd.1
rename to doc/man/ksystraycmd/ksystraycmd.1
diff --git a/doc/man/kxkb/CMakeLists.txt b/doc/man/kxkb/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/kxkb/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/kxkb.1 b/doc/man/kxkb/kxkb.1
similarity index 100%
rename from doc/man/kxkb.1
rename to doc/man/kxkb/kxkb.1
diff --git a/doc/man/starttde/CMakeLists.txt b/doc/man/starttde/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/starttde/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/starttde.1 b/doc/man/starttde/starttde.1
similarity index 100%
rename from doc/man/starttde.1
rename to doc/man/starttde/starttde.1
diff --git a/doc/man/tdedebugdialog/CMakeLists.txt b/doc/man/tdedebugdialog/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/tdedebugdialog/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/tdedebugdialog.1 b/doc/man/tdedebugdialog/tdedebugdialog.1
similarity index 100%
rename from doc/man/tdedebugdialog.1
rename to doc/man/tdedebugdialog/tdedebugdialog.1
diff --git a/doc/man/tdeio_system_documenthelper.1 b/doc/man/tdeio_system_documenthelper.1
deleted file mode 100644
index 270dd86e6..000000000
--- a/doc/man/tdeio_system_documenthelper.1
+++ /dev/null
@@ -1,22 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH  tdeio_system_documenthelper 1 "June 2006" "Trinity Desktop Environment" "helper script"
-.SH NAME
-tdeio_system_documenthelper
-\- TDE helper script used by document.desktop
-.SH SYNOPSIS
-\fBtdeio_system_documenthelper\fP
-
-.SH DESCRIPTION
-The script is used by document.desktop entry to determine if it must be shown or not.
-
-.SH AUTHORS
-.nf
-Kevin Ottens <ervin@ipsquad.net>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/doc/man/tdeioslave/CMakeLists.txt b/doc/man/tdeioslave/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/tdeioslave/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/ktrash.1 b/doc/man/tdeioslave/ktrash.1
similarity index 100%
rename from doc/man/ktrash.1
rename to doc/man/tdeioslave/ktrash.1
diff --git a/doc/man/tdeio_media_mounthelper.1 b/doc/man/tdeioslave/tdeio_media_mounthelper.1
similarity index 100%
rename from doc/man/tdeio_media_mounthelper.1
rename to doc/man/tdeioslave/tdeio_media_mounthelper.1
diff --git a/doc/man/tdepasswd/CMakeLists.txt b/doc/man/tdepasswd/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/tdepasswd/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/tdepasswd.1 b/doc/man/tdepasswd/tdepasswd.1
similarity index 100%
rename from doc/man/tdepasswd.1
rename to doc/man/tdepasswd/tdepasswd.1
diff --git a/doc/man/tdeprint/CMakeLists.txt b/doc/man/tdeprint/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/tdeprint/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/kjobviewer.1 b/doc/man/tdeprint/kjobviewer.1
similarity index 100%
rename from doc/man/kjobviewer.1
rename to doc/man/tdeprint/kjobviewer.1
diff --git a/doc/man/kprinter.1 b/doc/man/tdeprint/kprinter.1
similarity index 100%
rename from doc/man/kprinter.1
rename to doc/man/tdeprint/kprinter.1
diff --git a/doc/man/tdeprintfax.1 b/doc/man/tdeprint/tdeprintfax.1
similarity index 100%
rename from doc/man/tdeprintfax.1
rename to doc/man/tdeprint/tdeprintfax.1
diff --git a/doc/man/tdescreensaver/CMakeLists.txt b/doc/man/tdescreensaver/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/tdescreensaver/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/kblankscrn.kss.1 b/doc/man/tdescreensaver/kblankscrn.kss.1
similarity index 100%
rename from doc/man/kblankscrn.kss.1
rename to doc/man/tdescreensaver/kblankscrn.kss.1
diff --git a/doc/man/krandom.kss.1 b/doc/man/tdescreensaver/krandom.kss.1
similarity index 100%
rename from doc/man/krandom.kss.1
rename to doc/man/tdescreensaver/krandom.kss.1
diff --git a/doc/man/tdesu/CMakeLists.txt b/doc/man/tdesu/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/tdesu/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/tdesu.1 b/doc/man/tdesu/tdesu.1
similarity index 100%
rename from doc/man/tdesu.1
rename to doc/man/tdesu/tdesu.1
diff --git a/doc/man/tdm/CMakeLists.txt b/doc/man/tdm/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/tdm/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/gentdmconf.1 b/doc/man/tdm/gentdmconf.1
similarity index 100%
rename from doc/man/gentdmconf.1
rename to doc/man/tdm/gentdmconf.1
diff --git a/doc/man/krootimage.1 b/doc/man/tdm/krootimage.1
similarity index 100%
rename from doc/man/krootimage.1
rename to doc/man/tdm/krootimage.1
diff --git a/doc/man/tdm.1 b/doc/man/tdm/tdm.1
similarity index 100%
rename from doc/man/tdm.1
rename to doc/man/tdm/tdm.1
diff --git a/doc/man/tdm_config.1 b/doc/man/tdm/tdm_config.1
similarity index 100%
rename from doc/man/tdm_config.1
rename to doc/man/tdm/tdm_config.1
diff --git a/doc/man/tdm_greet.1 b/doc/man/tdm/tdm_greet.1
similarity index 100%
rename from doc/man/tdm_greet.1
rename to doc/man/tdm/tdm_greet.1
diff --git a/doc/man/tdmctl.1 b/doc/man/tdm/tdmctl.1
similarity index 100%
rename from doc/man/tdmctl.1
rename to doc/man/tdm/tdmctl.1