diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9fa1392..95460ed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,8 +72,14 @@ set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined"
 
 add_subdirectory( lib )
 add_subdirectory( src )
-tde_conditional_add_subdirectory( BUILD_DOC doc )
-tde_conditional_add_subdirectory( BUILD_TRANSLATIONS translations )
+
+
+##### other data ################################
+
+if( WITH_TDE )
+  tde_conditional_add_project_docs( BUILD_DOC )
+  tde_conditional_add_project_translations( BUILD_TRANSLATIONS )
+endif()
 
 
 ##### write configure files
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
deleted file mode 100644
index 0adf3d2..0000000
--- a/doc/CMakeLists.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-
-if( WITH_TDE )
-
-string( REGEX REPLACE "[ \r\n\t]+" ";" _linguas "$ENV{LINGUAS}" )
-
-# base documentation
-file( GLOB _dirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} * )
-list( REMOVE_ITEM _dirs html man tdeioslave )
-
-foreach( _dir IN LISTS _dirs )
-  if( IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${_dir}
-      AND ( "${_dir}" STREQUAL "en" OR
-            "${_linguas}" MATCHES "^;*$" OR
-            ";${_linguas};" MATCHES ";${_dir};" ))
-    file( GLOB _doc_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/${_dir} ${_dir}/*.docbook )
-    if( _doc_files )
-      list( FIND _doc_files "index.docbook" _find_index )
-      if( -1 EQUAL _find_index )
-        set( _noindex "NOINDEX" )
-      else()
-        unset( _noindex )
-      endif()
-      tde_create_handbook(
-        SOURCE_BASEDIR ${_dir}
-        ${_noindex}
-        LANG ${_dir}
-        DESTINATION ${PROJECT_NAME}
-      )
-    endif()
-  endif()
-endforeach()
-
-
-# tdeioslave documentation
-file( GLOB _dirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/tdeioslave tdeioslave/*/* )
-
-foreach( _dir IN LISTS _dirs )
-  get_filename_component( _lang ${_dir} PATH )
-  get_filename_component( _protocol ${_dir} NAME )
-  if( IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tdeioslave/${_dir}
-      AND NOT "${_lang}" STREQUAL "man"
-      AND ( "${_lang}" STREQUAL "en" OR
-            "${_linguas}" MATCHES "^;*$" OR
-            ";${_linguas};" MATCHES ";${_lang};" ))
-    file( GLOB _doc_files
-          RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/tdeioslave/${_dir}
-          tdeioslave/${_dir}/*.docbook )
-    if( _doc_files )
-      list( FIND _doc_files "index.docbook" _find_index )
-      if( -1 EQUAL _find_index )
-        set( _noindex "NOINDEX" )
-      else()
-        unset( _noindex )
-      endif()
-      tde_create_handbook(
-        SOURCE_BASEDIR tdeioslave/${_dir}
-        ${_noindex}
-        LANG ${_lang}
-        DESTINATION tdeioslave/${_protocol}
-      )
-    endif()
-  endif()
-endforeach()
-
-endif( WITH_TDE )
-
-
-if( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/man/CMakeLists.txt )
-  add_subdirectory( man )
-endif()
diff --git a/doc/tdeioslave/en/msits/index.docbook b/doc/en/tdeioslave/msits/index.docbook
similarity index 100%
rename from doc/tdeioslave/en/msits/index.docbook
rename to doc/en/tdeioslave/msits/index.docbook
diff --git a/doc/man/CMakeLists.txt b/doc/man/CMakeLists.txt
deleted file mode 100644
index 8512250..0000000
--- a/doc/man/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-INSTALL(
-    FILES ${PROJECT_NAME}.1
-    DESTINATION ${MAN_INSTALL_DIR}/man1
-    COMPONENT doc
-)
diff --git a/translations/CMakeLists.txt b/translations/CMakeLists.txt
deleted file mode 100644
index 42b186a..0000000
--- a/translations/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-tde_auto_add_subdirectories()
diff --git a/translations/messages/CMakeLists.txt b/translations/messages/CMakeLists.txt
deleted file mode 100644
index 75c89f8..0000000
--- a/translations/messages/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-file( GLOB_RECURSE po_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.po )
-string( REGEX REPLACE "[ \r\n\t]+" ";" _linguas "$ENV{LINGUAS}" )
-
-foreach( _po ${po_files} )
-  get_filename_component( _lang ${_po} NAME_WE )
-  if( "${_linguas}" MATCHES "^;*$" OR ";${_linguas};" MATCHES ";${_lang};" )
-    if( "${_po}" MATCHES "^([^/]*)/.*" )
-      string( REGEX REPLACE "^([^/]*)/.*" "\\1" _component "${_po}" )
-    else( )
-      set( _component "${PROJECT_NAME}" )
-    endif( )
-    tde_create_translation( FILES ${_po} LANG ${_lang} OUTPUT_NAME ${_component} )
-  endif( )
-endforeach( )