diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5290d03..457c111 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,8 +69,12 @@ set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined"
 ##### directories
 
 add_subdirectory( src )
-tde_conditional_add_subdirectory( BUILD_DOC doc )
-tde_conditional_add_subdirectory( BUILD_TRANSLATIONS translations )
+
+
+##### other data
+
+tde_conditional_add_project_docs( BUILD_DOC )
+tde_conditional_add_project_translations( BUILD_TRANSLATIONS )
 
 
 ##### write configure files
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
deleted file mode 100644
index 19e0c1e..0000000
--- a/doc/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-file( GLOB _dirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} * )
-string( REGEX REPLACE "[ \r\n\t]+" ";" _linguas "$ENV{LINGUAS}" )
-
-list( REMOVE_ITEM _dirs "tdeioslave" )
-
-foreach( _dir ${_dirs} )
-  if( IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${_dir} AND
-      EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${_dir}/CMakeLists.txt )
-    if( "${_dir}" STREQUAL "en" OR
-        "${_dir}" STREQUAL "man" OR
-        "${_linguas}" MATCHES "^;*$" OR
-        ";${_linguas};" MATCHES ";${_dir};" )
-      add_subdirectory( ${_dir} )
-    endif( )
-  endif()
-endforeach()
-
-add_subdirectory( tdeioslave )
diff --git a/doc/de/CMakeLists.txt b/doc/de/CMakeLists.txt
deleted file mode 100644
index eca4bd4..0000000
--- a/doc/de/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG de )
diff --git a/doc/en/CMakeLists.txt b/doc/en/CMakeLists.txt
deleted file mode 100644
index ffa59a8..0000000
--- a/doc/en/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG en )
diff --git a/doc/tdeioslave/en/pcf/index.docbook b/doc/en/tdeioslave/pcf/index.docbook
similarity index 100%
rename from doc/tdeioslave/en/pcf/index.docbook
rename to doc/en/tdeioslave/pcf/index.docbook
diff --git a/doc/fr/CMakeLists.txt b/doc/fr/CMakeLists.txt
deleted file mode 100644
index 495f168..0000000
--- a/doc/fr/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG fr )
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/doc/sv/CMakeLists.txt b/doc/sv/CMakeLists.txt
deleted file mode 100644
index bc04ab0..0000000
--- a/doc/sv/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG sv )
diff --git a/doc/tdeioslave/CMakeLists.txt b/doc/tdeioslave/CMakeLists.txt
deleted file mode 100644
index 70d6348..0000000
--- a/doc/tdeioslave/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-file( GLOB _dirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} * )
-string( REGEX REPLACE "[ \r\n\t]+" ";" _linguas "$ENV{LINGUAS}" )
-
-foreach( _dir ${_dirs} )
-  if( IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${_dir} AND
-      EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${_dir}/CMakeLists.txt )
-    if( "${_dir}" STREQUAL "en" OR
-        "${_dir}" STREQUAL "man" OR
-        "${_linguas}" MATCHES "^;*$" OR
-        ";${_linguas};" MATCHES ";${_dir};" )
-      add_subdirectory( ${_dir} )
-    endif( )
-  endif()
-endforeach()
diff --git a/doc/tdeioslave/en/CMakeLists.txt b/doc/tdeioslave/en/CMakeLists.txt
deleted file mode 100644
index a87ea53..0000000
--- a/doc/tdeioslave/en/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_subdirectory( pcf )
diff --git a/doc/tdeioslave/en/pcf/CMakeLists.txt b/doc/tdeioslave/en/pcf/CMakeLists.txt
deleted file mode 100644
index d9da7d1..0000000
--- a/doc/tdeioslave/en/pcf/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-tde_create_handbook( DESTINATION tdeioslave/pcf )
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( )