diff --git a/Doxyfile b/Doxyfile
index c0d0be82..fe8215aa 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -230,18 +230,18 @@ SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references   
 #---------------------------------------------------------------------------
-TAGFILES               = $(TDEDIR)/share/doc/HTML/en/tdelibs-apidocs/dcop/dcop.tag=$(TDEDIR)/share/doc/HTML/en/tdelibs-apidocs/dcop/html/ \
-                         $(TDEDIR)/share/doc/HTML/en/tdelibs-apidocs/interfaces/interfaces.tag=$(TDEDIR)/share/doc/HTML/en/tdelibs-apidocs/interfaces/html/ \
-                         $(TDEDIR)/share/doc/HTML/en/tdelibs-apidocs/tdecore/tdecore.tag=$(TDEDIR)/share/doc/HTML/en/tdelibs-apidocs/tdecore/html/ \
-                         $(TDEDIR)/share/doc/HTML/en/tdelibs-apidocs/tdefx/tdefx.tag=$(TDEDIR)/share/doc/HTML/en/tdelibs-apidocs/tdefx/html/ \
-                         $(TDEDIR)/share/doc/HTML/en/tdelibs-apidocs/tdeui/tdeui.tag=$(TDEDIR)/share/doc/HTML/en/tdelibs-apidocs/tdeui/html/ \
-                         $(TDEDIR)/share/doc/HTML/en/tdelibs-apidocs/khtml/khtml.tag=$(TDEDIR)/share/doc/HTML/en/tdelibs-apidocs/khtml/html/ \
-                         $(TDEDIR)/share/doc/HTML/en/tdelibs-apidocs/kio/kio.tag=$(TDEDIR)/share/doc/HTML/en/tdelibs-apidocs/kio/html/ \
-                         $(TDEDIR)/share/doc/HTML/en/tdelibs-apidocs/kjs/kjs.tag=$(TDEDIR)/share/doc/HTML/en/tdelibs-apidocs/kjs/html/ \
-                         $(TDEDIR)/share/doc/HTML/en/tdelibs-apidocs/kparts/kparts.tag=$(TDEDIR)/share/doc/HTML/en/tdelibs-apidocs/kparts/html/ \
-                         $(TDEDIR)/share/doc/HTML/en/tdelibs-apidocs/kmdi/kmdi.tag=$(TDEDIR)/share/doc/HTML/en/tdelibs-apidocs/kmdi/html/ \
-                         $(TDEDIR)/share/doc/HTML/en/tdelibs-apidocs/kutils/kutils.tag=$(TDEDIR)/share/doc/HTML/en/tdelibs-apidocs/kutils/html/ \
-                         $(TDEDIR)/share/doc/HTML/en/tdelibs-apidocs/qt/qt.tag=$(QTDIR)/doc/html
+TAGFILES               = $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/dcop/dcop.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/dcop/html/ \
+                         $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/interfaces/interfaces.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/interfaces/html/ \
+                         $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdecore/tdecore.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdecore/html/ \
+                         $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdefx/tdefx.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdefx/html/ \
+                         $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdeui/tdeui.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdeui/html/ \
+                         $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/khtml/khtml.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/khtml/html/ \
+                         $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/kio/kio.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/kio/html/ \
+                         $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/kjs/kjs.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/kjs/html/ \
+                         $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/kparts/kparts.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/kparts/html/ \
+                         $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/kmdi/kmdi.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/kmdi/html/ \
+                         $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/kutils/kutils.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/kutils/html/ \
+                         $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/qt/qt.tag=$(QTDIR)/doc/html
 GENERATE_TAGFILE       = 
 ALLEXTERNALS           = NO
 EXTERNAL_GROUPS        = NO
diff --git a/doc/tdevelop/setup.docbook b/doc/tdevelop/setup.docbook
index 6f8577e3..366f25a7 100644
--- a/doc/tdevelop/setup.docbook
+++ b/doc/tdevelop/setup.docbook
@@ -1600,7 +1600,7 @@ In short, such an &API; documents the interface to certain library functions. Th
 There are some structural constraints assumed when searching for &doxygen; generated &API; documentation. The directory in which the <filename>index.html</filename> file resides should contain subdirectories with separate documentation collections. Each of these subdirectories is assumed to contain a <filename>.tag</filename> file and a <filename class="directory">html/</filename> subdirectory.
 </para>
 <para>
-You may have a look at <filename class="directory">$<envar>TDEDIR</envar>/share/doc/HTML/en/tdelibs-apidocs</filename> for an example of such a &doxygen; &API; documentation layout.
+You may have a look at <filename class="directory">$<envar>TDEDIR</envar>/share/doc/tde/HTML/en/tdelibs-apidocs</filename> for an example of such a &doxygen; &API; documentation layout.
 </para>
 
 <note><para>
@@ -1621,7 +1621,7 @@ The older &kde; <ulink url="http://sirtaj.net/projects/kdoc/">KDoc</ulink> gener
   Or the <command>configure</command> command did automatically find a &doxygen; generated &kde; Libraries &API; in one of several standard locations it knows of.
   </para></listitem>
   <listitem><para>
-  Or as a last resort the <filename class="directory">$<envar>TDEDIR</envar>/share/doc/HTML/en/tdelibs-apidocs/</filename> was found at the first &tdevelop; startup.
+  Or as a last resort the <filename class="directory">$<envar>TDEDIR</envar>/share/doc/tde/HTML/en/tdelibs-apidocs/</filename> was found at the first &tdevelop; startup.
   </para></listitem>
 </itemizedlist>
 
diff --git a/doc/tdevelop/tdevelop-install.docbook b/doc/tdevelop/tdevelop-install.docbook
index 94b42ac0..05f6ef5a 100644
--- a/doc/tdevelop/tdevelop-install.docbook
+++ b/doc/tdevelop/tdevelop-install.docbook
@@ -539,7 +539,7 @@ If you want to build your own <link linkend="make-api">API documentation</link>
 </para>
 <informalexample><simplelist>
   <member><prompt>~/trinitysrc/tdevelop&gt; </prompt>
-  <userinput>./configure --</userinput>(options-as-above) <userinput>\</userinput></member> <member><userinput>--with-tdelibsdoxy-dir=$TDEDIR/share/doc/HTML/en/tdelibs-apidocs</userinput></member>
+  <userinput>./configure --</userinput>(options-as-above) <userinput>\</userinput></member> <member><userinput>--with-tdelibsdoxy-dir=$TDEDIR/share/doc/tde/HTML/en/tdelibs-apidocs</userinput></member>
 </simplelist></informalexample>
 </note>
 </listitem>
@@ -711,7 +711,7 @@ Alas, this version is best used read-only over the internet. If you do not alway
     <userinput>./configure --</userinput>(options-as-usual)<userinput> \</userinput>
   </member>
   <member>
-    <userinput>--with-tdelibsdoxy-dir=$TDEDIR/share/doc/HTML/en/tdelibs-apidocs</userinput>
+    <userinput>--with-tdelibsdoxy-dir=$TDEDIR/share/doc/tde/HTML/en/tdelibs-apidocs</userinput>
   </member>
 </simplelist></informalexample>
 
diff --git a/tdevelop.m4.in b/tdevelop.m4.in
index 0e062a19..7b83cc2c 100644
--- a/tdevelop.m4.in
+++ b/tdevelop.m4.in
@@ -48,9 +48,9 @@ tdelibs_doxydirs=""
 )
 
 if test "${prefix}" = NONE; then
-  ac_kde_htmldir="$ac_default_prefix"/share/doc/HTML
+  ac_kde_htmldir="$ac_default_prefix"/share/doc/tde/HTML
 else
-  ac_kde_htmldir="$prefix"/share/doc/HTML
+  ac_kde_htmldir="$prefix"/share/doc/tde/HTML
 fi
 
 tdelibs_doxydirs="$ac_tdelibs_doxydirs $ac_kde_htmldir/default/tdelibs-apidocs $ac_kde_htmldir/en/tdelibs-apidocs"
@@ -82,9 +82,9 @@ tdelibs_docdirs=""
 )
 
 if test "${prefix}" = NONE; then
-  ac_kde_htmldir="$ac_default_prefix"/share/doc/HTML
+  ac_kde_htmldir="$ac_default_prefix"/share/doc/tde/HTML
 else
-  ac_kde_htmldir="$prefix"/share/doc/HTML
+  ac_kde_htmldir="$prefix"/share/doc/tde/HTML
 fi
 
 tdelibs_docdirs="/usr/doc/tdelibs-doc/html"