diff --git a/CMakeLists.txt b/CMakeLists.txt
index a88feb5..b3614c6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -96,7 +96,6 @@ set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined"
 set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" )
 
 ##### activate dependencies #####################
-
 add_subdirectory( src/tdebluez-common )
 add_subdirectory( src/libtdebluez )
 add_subdirectory( src/libtdeobex )
@@ -111,3 +110,5 @@ add_subdirectory( src/tdebluezauth )
 #  add_subdirectory( src/testbluez )
 #endif()
 
+tde_conditional_add_subdirectory( BUILD_DOC doc         )
+tde_conditional_add_subdirectory( BUILD_TRANSLATIONS po )
diff --git a/debian/tdebluez.install b/debian/tdebluez.install
index b45ec66..2cb7792 100644
--- a/debian/tdebluez.install
+++ b/debian/tdebluez.install
@@ -10,6 +10,7 @@ opt/trinity/lib/trinity/tdeio_bluetooth.la
 opt/trinity/lib/trinity/tdeio_obex.so
 opt/trinity/lib/trinity/tdeio_obex.la
 opt/trinity/share/apps/tdebluez/icons/*
+opt/trinity/share/doc/tde/HTML/*
 opt/trinity/share/apps/tdebluez/eventsrc
 opt/trinity/share/apps/tdebluez/tde-settings-network-bluetooth.directory
 opt/trinity/share/applications/tde/tdebluez.desktop
diff --git a/doc/tdebluez/CMakeLists.txt b/doc/en/CMakeLists.txt
similarity index 100%
rename from doc/tdebluez/CMakeLists.txt
rename to doc/en/CMakeLists.txt
diff --git a/doc/tdebluez/bemused.docbook b/doc/en/bemused.docbook
similarity index 100%
rename from doc/tdebluez/bemused.docbook
rename to doc/en/bemused.docbook
diff --git a/doc/tdebluez/components.docbook b/doc/en/components.docbook
similarity index 100%
rename from doc/tdebluez/components.docbook
rename to doc/en/components.docbook
diff --git a/doc/tdebluez/concepts.docbook b/doc/en/concepts.docbook
similarity index 100%
rename from doc/tdebluez/concepts.docbook
rename to doc/en/concepts.docbook
diff --git a/doc/tdebluez/credits.docbook b/doc/en/credits.docbook
similarity index 100%
rename from doc/tdebluez/credits.docbook
rename to doc/en/credits.docbook
diff --git a/doc/tdebluez/developers.docbook b/doc/en/developers.docbook
similarity index 100%
rename from doc/tdebluez/developers.docbook
rename to doc/en/developers.docbook
diff --git a/doc/tdebluez/download.docbook b/doc/en/download.docbook
similarity index 100%
rename from doc/tdebluez/download.docbook
rename to doc/en/download.docbook
diff --git a/doc/tdebluez/faq.docbook b/doc/en/faq.docbook
similarity index 100%
rename from doc/tdebluez/faq.docbook
rename to doc/en/faq.docbook
diff --git a/doc/tdebluez/handsfree.docbook b/doc/en/handsfree.docbook
similarity index 100%
rename from doc/tdebluez/handsfree.docbook
rename to doc/en/handsfree.docbook
diff --git a/doc/tdebluez/index.docbook b/doc/en/index.docbook
similarity index 100%
rename from doc/tdebluez/index.docbook
rename to doc/en/index.docbook
diff --git a/doc/tdebluez/installation.docbook b/doc/en/installation.docbook
similarity index 100%
rename from doc/tdebluez/installation.docbook
rename to doc/en/installation.docbook
diff --git a/doc/tdebluez/introduction.docbook b/doc/en/introduction.docbook
similarity index 100%
rename from doc/tdebluez/introduction.docbook
rename to doc/en/introduction.docbook
diff --git a/doc/tdebluez/irmcsynckonnector.docbook b/doc/en/irmcsynckonnector.docbook
similarity index 100%
rename from doc/tdebluez/irmcsynckonnector.docbook
rename to doc/en/irmcsynckonnector.docbook
diff --git a/doc/tdebluez/kbluelock.docbook b/doc/en/kbluelock.docbook
similarity index 100%
rename from doc/tdebluez/kbluelock.docbook
rename to doc/en/kbluelock.docbook
diff --git a/doc/tdebluez/kbluetoothd.docbook b/doc/en/kbluetoothd.docbook
similarity index 100%
rename from doc/tdebluez/kbluetoothd.docbook
rename to doc/en/kbluetoothd.docbook
diff --git a/doc/tdebluez/kbtobexclient.docbook b/doc/en/kbtobexclient.docbook
similarity index 100%
rename from doc/tdebluez/kbtobexclient.docbook
rename to doc/en/kbtobexclient.docbook
diff --git a/doc/tdebluez/kbtobexsrv.docbook b/doc/en/kbtobexsrv.docbook
similarity index 100%
rename from doc/tdebluez/kbtobexsrv.docbook
rename to doc/en/kbtobexsrv.docbook
diff --git a/doc/tdebluez/kbtserialchat.docbook b/doc/en/kbtserialchat.docbook
similarity index 100%
rename from doc/tdebluez/kbtserialchat.docbook
rename to doc/en/kbtserialchat.docbook
diff --git a/doc/tdebluez/khciconfig.docbook b/doc/en/khciconfig.docbook
similarity index 100%
rename from doc/tdebluez/khciconfig.docbook
rename to doc/en/khciconfig.docbook
diff --git a/doc/tdebluez/links.docbook b/doc/en/links.docbook
similarity index 100%
rename from doc/tdebluez/links.docbook
rename to doc/en/links.docbook
diff --git a/doc/tdebluez/news.docbook b/doc/en/news.docbook
similarity index 100%
rename from doc/tdebluez/news.docbook
rename to doc/en/news.docbook
diff --git a/doc/tdebluez/othertools.docbook b/doc/en/othertools.docbook
similarity index 100%
rename from doc/tdebluez/othertools.docbook
rename to doc/en/othertools.docbook
diff --git a/doc/tdebluez/tdeio_obex.docbook b/doc/en/tdeio_obex.docbook
similarity index 100%
rename from doc/tdebluez/tdeio_obex.docbook
rename to doc/en/tdeio_obex.docbook
diff --git a/doc/tdebluez/tdeio_sdp.docbook b/doc/en/tdeio_sdp.docbook
similarity index 100%
rename from doc/tdebluez/tdeio_sdp.docbook
rename to doc/en/tdeio_sdp.docbook