diff --git a/CMakeLists.txt b/CMakeLists.txt
index b3edff1..efbf6ba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -78,8 +78,12 @@ set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined"
 ##### directories
 
 add_subdirectory( ${PROJECT_NAME} )
-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 633b623..0000000
--- a/doc/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-
-tde_auto_add_subdirectories( )
diff --git a/doc/kaffeine/discwindow.png b/doc/en/discwindow.png
similarity index 100%
rename from doc/kaffeine/discwindow.png
rename to doc/en/discwindow.png
diff --git a/doc/kaffeine/dvbbroadcast.png b/doc/en/dvbbroadcast.png
similarity index 100%
rename from doc/kaffeine/dvbbroadcast.png
rename to doc/en/dvbbroadcast.png
diff --git a/doc/kaffeine/dvbclient.png b/doc/en/dvbclient.png
similarity index 100%
rename from doc/kaffeine/dvbclient.png
rename to doc/en/dvbclient.png
diff --git a/doc/kaffeine/dvbconfig.png b/doc/en/dvbconfig.png
similarity index 100%
rename from doc/kaffeine/dvbconfig.png
rename to doc/en/dvbconfig.png
diff --git a/doc/kaffeine/dvbepg.png b/doc/en/dvbepg.png
similarity index 100%
rename from doc/kaffeine/dvbepg.png
rename to doc/en/dvbepg.png
diff --git a/doc/kaffeine/dvblive.jpg b/doc/en/dvblive.jpg
similarity index 100%
rename from doc/kaffeine/dvblive.jpg
rename to doc/en/dvblive.jpg
diff --git a/doc/kaffeine/dvbscan.png b/doc/en/dvbscan.png
similarity index 100%
rename from doc/kaffeine/dvbscan.png
rename to doc/en/dvbscan.png
diff --git a/doc/kaffeine/dvbtimers.png b/doc/en/dvbtimers.png
similarity index 100%
rename from doc/kaffeine/dvbtimers.png
rename to doc/en/dvbtimers.png
diff --git a/doc/kaffeine/dvbwin.png b/doc/en/dvbwin.png
similarity index 100%
rename from doc/kaffeine/dvbwin.png
rename to doc/en/dvbwin.png
diff --git a/doc/kaffeine/gstpart.png b/doc/en/gstpart.png
similarity index 100%
rename from doc/kaffeine/gstpart.png
rename to doc/en/gstpart.png
diff --git a/doc/kaffeine/index.docbook b/doc/en/index.docbook
similarity index 100%
rename from doc/kaffeine/index.docbook
rename to doc/en/index.docbook
diff --git a/doc/kaffeine/kaffeinepart.png b/doc/en/kaffeinepart.png
similarity index 100%
rename from doc/kaffeine/kaffeinepart.png
rename to doc/en/kaffeinepart.png
diff --git a/doc/kaffeine/playlistwin.png b/doc/en/playlistwin.png
similarity index 100%
rename from doc/kaffeine/playlistwin.png
rename to doc/en/playlistwin.png
diff --git a/doc/kaffeine/startwindow.png b/doc/en/startwindow.png
similarity index 100%
rename from doc/kaffeine/startwindow.png
rename to doc/en/startwindow.png
diff --git a/doc/kaffeine/CMakeLists.txt b/doc/kaffeine/CMakeLists.txt
deleted file mode 100644
index 65ddbc7..0000000
--- a/doc/kaffeine/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-##### help page
-
-
-file( GLOB _srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.docbook *.css *.png *.jpg )
-tde_create_handbook(
-    FILES ${_srcs}
-    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/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( )