diff --git a/CMakeLists.txt b/CMakeLists.txt
index c5107a8..c9a4dd4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,8 +72,12 @@ add_subdirectory( maps )
 add_subdirectory( pics )
 add_subdirectory( fonts )
 add_subdirectory( tdepacman )
-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 70d6348..0000000
--- a/doc/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/de/CMakeLists.txt b/doc/de/CMakeLists.txt
deleted file mode 100644
index 0e17c6c..0000000
--- a/doc/de/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-file( GLOB _files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.html )
-
-install(
-    FILES ${_files} tdepacman.gif
-    DESTINATION ${HTML_INSTALL_DIR}/de/${PROJECT_NAME}
-)
diff --git a/doc/en/CMakeLists.txt b/doc/en/CMakeLists.txt
deleted file mode 100644
index 94201a1..0000000
--- a/doc/en/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-file( GLOB _files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.html )
-
-install(
-    FILES ${_files} tdepacman.gif screenshot.png
-    DESTINATION ${HTML_INSTALL_DIR}/en/${PROJECT_NAME}
-)
-
-tde_create_handbook( DESTINATION ${PROJECT_NAME} )
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/tdepacman-api/TDEpacman.html b/doc/other/tdepacman-api/TDEpacman.html
similarity index 100%
rename from doc/tdepacman-api/TDEpacman.html
rename to doc/other/tdepacman-api/TDEpacman.html
diff --git a/doc/tdepacman-api/all-globals.html b/doc/other/tdepacman-api/all-globals.html
similarity index 100%
rename from doc/tdepacman-api/all-globals.html
rename to doc/other/tdepacman-api/all-globals.html
diff --git a/doc/tdepacman-api/full-list-TDEpacman.html b/doc/other/tdepacman-api/full-list-TDEpacman.html
similarity index 100%
rename from doc/tdepacman-api/full-list-TDEpacman.html
rename to doc/other/tdepacman-api/full-list-TDEpacman.html
diff --git a/doc/tdepacman-api/header-list.html b/doc/other/tdepacman-api/header-list.html
similarity index 100%
rename from doc/tdepacman-api/header-list.html
rename to doc/other/tdepacman-api/header-list.html
diff --git a/doc/tdepacman-api/hier.html b/doc/other/tdepacman-api/hier.html
similarity index 100%
rename from doc/tdepacman-api/hier.html
rename to doc/other/tdepacman-api/hier.html
diff --git a/doc/tdepacman-api/index-long.html b/doc/other/tdepacman-api/index-long.html
similarity index 100%
rename from doc/tdepacman-api/index-long.html
rename to doc/other/tdepacman-api/index-long.html
diff --git a/doc/tdepacman-api/index.html b/doc/other/tdepacman-api/index.html
similarity index 100%
rename from doc/tdepacman-api/index.html
rename to doc/other/tdepacman-api/index.html
diff --git a/doc/tdepacman-api/tdepacman_h.html b/doc/other/tdepacman-api/tdepacman_h.html
similarity index 100%
rename from doc/tdepacman-api/tdepacman_h.html
rename to doc/other/tdepacman-api/tdepacman_h.html
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( )