diff --git a/debian/lenny/applications/filelight/debian/rules b/debian/lenny/applications/filelight/debian/rules
index a7c79577a..29d7edcd8 100755
--- a/debian/lenny/applications/filelight/debian/rules
+++ b/debian/lenny/applications/filelight/debian/rules
@@ -39,4 +39,4 @@ debian/stamp-bootstrap:
 
 common-install-arch::
 	rm -rf debian/filelight/usr/share/locale/
-	rm -rf debian/filelight/usr/share/doc/kde/
+	rm -rf debian/filelight/usr/share/doc/tde/
diff --git a/debian/lenny/applications/k3b/debian/k3b-data-trinity.install b/debian/lenny/applications/k3b/debian/k3b-data-trinity.install
index 68b612b6f..af584fe32 100644
--- a/debian/lenny/applications/k3b/debian/k3b-data-trinity.install
+++ b/debian/lenny/applications/k3b/debian/k3b-data-trinity.install
@@ -1,7 +1,7 @@
 debian/tmp/opt/trinity/share/applnk/.hidden/*
 debian/tmp/opt/trinity/share/apps/*
 debian/tmp/opt/trinity/share/icons/*
-debian/tmp/opt/trinity/share/doc/kde/*
+debian/tmp/opt/trinity/share/doc/tde/*
 debian/tmp/opt/trinity/share/sounds/*
 debian/tmp/opt/trinity/share/mimelnk/*
 debian/tmp/opt/trinity/share/services/*
diff --git a/debian/lenny/applications/k3b/debian/k3b-data.files b/debian/lenny/applications/k3b/debian/k3b-data.files
index 2bbfe5151..3b3a0add7 100644
--- a/debian/lenny/applications/k3b/debian/k3b-data.files
+++ b/debian/lenny/applications/k3b/debian/k3b-data.files
@@ -2,4 +2,4 @@ usr/share/apps/*
 usr/share/icons/*
 usr/share/kde/*
 usr/share/sounds/*
-usr/share/doc/kde/*
+usr/share/doc/tde/*
diff --git a/debian/lenny/applications/k3b/debian/k3b-data.install b/debian/lenny/applications/k3b/debian/k3b-data.install
index 0c6615e9b..b7175c514 100644
--- a/debian/lenny/applications/k3b/debian/k3b-data.install
+++ b/debian/lenny/applications/k3b/debian/k3b-data.install
@@ -1,7 +1,7 @@
 debian/tmp/usr/share/applnk/.hidden/*
 debian/tmp/usr/share/apps/*
 debian/tmp/usr/share/icons/*
-debian/tmp/usr/share/doc/kde/*
+debian/tmp/usr/share/doc/tde/*
 debian/tmp/usr/share/sounds/*
 debian/tmp/usr/share/mimelnk/*
 debian/tmp/usr/share/services/*
diff --git a/debian/lenny/applications/kdesvn/debian/kdesvn-trinity.install b/debian/lenny/applications/kdesvn/debian/kdesvn-trinity.install
index a222a6ad4..3b80f418f 100644
--- a/debian/lenny/applications/kdesvn/debian/kdesvn-trinity.install
+++ b/debian/lenny/applications/kdesvn/debian/kdesvn-trinity.install
@@ -9,5 +9,5 @@ debian/tmp/opt/trinity/share/icons/
 debian/tmp/opt/trinity/share/locale/*/LC_MESSAGES/*.mo
 debian/tmp/opt/trinity/share/config.kcfg/
 debian/tmp/opt/trinity/share/applications/kde/*.desktop
-debian/tmp/opt/trinity/share/doc/HTML/ /opt/trinity/share/doc/kde/
+debian/tmp/opt/trinity/share/doc/tde/
 
diff --git a/debian/lenny/applications/kpicosim/debian/rules b/debian/lenny/applications/kpicosim/debian/rules
index 130208334..135e084ba 100755
--- a/debian/lenny/applications/kpicosim/debian/rules
+++ b/debian/lenny/applications/kpicosim/debian/rules
@@ -92,7 +92,7 @@ install: build
 	 if test ! -d debian/$$pkg/opt/trinity/share/doc/tde; then \
 	 mkdir debian/$$pkg/opt/trinity/share/doc/tde; \
 	 fi; \
-	 mv debian/$$pkg/opt/trinity/share/doc/HTML debian/$$pkg/opt/trinity/share/doc/kde/; \
+	 mv debian/$$pkg/opt/trinity/share/doc/HTML debian/$$pkg/opt/trinity/share/doc/tde/; \
 	 fi; \
 	 if test -d debian/$$pkg/opt/trinity/share/doc/tde/HTML/en/$$pkg; then \
 	 dh_link -p$$pkg opt/trinity/share/doc/tde/HTML/en/$$pkg \
diff --git a/debian/squeeze/applications/filelight/debian/rules b/debian/squeeze/applications/filelight/debian/rules
index dead1a6ed..8683a3480 100755
--- a/debian/squeeze/applications/filelight/debian/rules
+++ b/debian/squeeze/applications/filelight/debian/rules
@@ -39,4 +39,4 @@ debian/stamp-bootstrap:
 
 common-install-arch::
 	rm -rf debian/filelight/usr/share/locale/
-	rm -rf debian/filelight/usr/share/doc/kde/
+	rm -rf debian/filelight/usr/share/doc/tde/
diff --git a/debian/squeeze/applications/k3b/debian/k3b-data-trinity.install b/debian/squeeze/applications/k3b/debian/k3b-data-trinity.install
index 68b612b6f..af584fe32 100644
--- a/debian/squeeze/applications/k3b/debian/k3b-data-trinity.install
+++ b/debian/squeeze/applications/k3b/debian/k3b-data-trinity.install
@@ -1,7 +1,7 @@
 debian/tmp/opt/trinity/share/applnk/.hidden/*
 debian/tmp/opt/trinity/share/apps/*
 debian/tmp/opt/trinity/share/icons/*
-debian/tmp/opt/trinity/share/doc/kde/*
+debian/tmp/opt/trinity/share/doc/tde/*
 debian/tmp/opt/trinity/share/sounds/*
 debian/tmp/opt/trinity/share/mimelnk/*
 debian/tmp/opt/trinity/share/services/*
diff --git a/debian/squeeze/applications/k3b/debian/k3b-data.files b/debian/squeeze/applications/k3b/debian/k3b-data.files
index 2bbfe5151..3b3a0add7 100644
--- a/debian/squeeze/applications/k3b/debian/k3b-data.files
+++ b/debian/squeeze/applications/k3b/debian/k3b-data.files
@@ -2,4 +2,4 @@ usr/share/apps/*
 usr/share/icons/*
 usr/share/kde/*
 usr/share/sounds/*
-usr/share/doc/kde/*
+usr/share/doc/tde/*
diff --git a/debian/squeeze/applications/k3b/debian/k3b-data.install b/debian/squeeze/applications/k3b/debian/k3b-data.install
index 0c6615e9b..b7175c514 100644
--- a/debian/squeeze/applications/k3b/debian/k3b-data.install
+++ b/debian/squeeze/applications/k3b/debian/k3b-data.install
@@ -1,7 +1,7 @@
 debian/tmp/usr/share/applnk/.hidden/*
 debian/tmp/usr/share/apps/*
 debian/tmp/usr/share/icons/*
-debian/tmp/usr/share/doc/kde/*
+debian/tmp/usr/share/doc/tde/*
 debian/tmp/usr/share/sounds/*
 debian/tmp/usr/share/mimelnk/*
 debian/tmp/usr/share/services/*
diff --git a/debian/squeeze/applications/kdesvn/debian/kdesvn-trinity.install b/debian/squeeze/applications/kdesvn/debian/kdesvn-trinity.install
index a222a6ad4..3b80f418f 100644
--- a/debian/squeeze/applications/kdesvn/debian/kdesvn-trinity.install
+++ b/debian/squeeze/applications/kdesvn/debian/kdesvn-trinity.install
@@ -9,5 +9,5 @@ debian/tmp/opt/trinity/share/icons/
 debian/tmp/opt/trinity/share/locale/*/LC_MESSAGES/*.mo
 debian/tmp/opt/trinity/share/config.kcfg/
 debian/tmp/opt/trinity/share/applications/kde/*.desktop
-debian/tmp/opt/trinity/share/doc/HTML/ /opt/trinity/share/doc/kde/
+debian/tmp/opt/trinity/share/doc/tde/
 
diff --git a/debian/squeeze/applications/kpicosim/debian/rules b/debian/squeeze/applications/kpicosim/debian/rules
index 130208334..135e084ba 100755
--- a/debian/squeeze/applications/kpicosim/debian/rules
+++ b/debian/squeeze/applications/kpicosim/debian/rules
@@ -92,7 +92,7 @@ install: build
 	 if test ! -d debian/$$pkg/opt/trinity/share/doc/tde; then \
 	 mkdir debian/$$pkg/opt/trinity/share/doc/tde; \
 	 fi; \
-	 mv debian/$$pkg/opt/trinity/share/doc/HTML debian/$$pkg/opt/trinity/share/doc/kde/; \
+	 mv debian/$$pkg/opt/trinity/share/doc/HTML debian/$$pkg/opt/trinity/share/doc/tde/; \
 	 fi; \
 	 if test -d debian/$$pkg/opt/trinity/share/doc/tde/HTML/en/$$pkg; then \
 	 dh_link -p$$pkg opt/trinity/share/doc/tde/HTML/en/$$pkg \
diff --git a/ubuntu/maverick/applications/filelight/debian/rules b/ubuntu/maverick/applications/filelight/debian/rules
index dead1a6ed..8683a3480 100755
--- a/ubuntu/maverick/applications/filelight/debian/rules
+++ b/ubuntu/maverick/applications/filelight/debian/rules
@@ -39,4 +39,4 @@ debian/stamp-bootstrap:
 
 common-install-arch::
 	rm -rf debian/filelight/usr/share/locale/
-	rm -rf debian/filelight/usr/share/doc/kde/
+	rm -rf debian/filelight/usr/share/doc/tde/
diff --git a/ubuntu/maverick/applications/k3b/debian/k3b-data-trinity.install b/ubuntu/maverick/applications/k3b/debian/k3b-data-trinity.install
index 68b612b6f..af584fe32 100644
--- a/ubuntu/maverick/applications/k3b/debian/k3b-data-trinity.install
+++ b/ubuntu/maverick/applications/k3b/debian/k3b-data-trinity.install
@@ -1,7 +1,7 @@
 debian/tmp/opt/trinity/share/applnk/.hidden/*
 debian/tmp/opt/trinity/share/apps/*
 debian/tmp/opt/trinity/share/icons/*
-debian/tmp/opt/trinity/share/doc/kde/*
+debian/tmp/opt/trinity/share/doc/tde/*
 debian/tmp/opt/trinity/share/sounds/*
 debian/tmp/opt/trinity/share/mimelnk/*
 debian/tmp/opt/trinity/share/services/*
diff --git a/ubuntu/maverick/applications/k3b/debian/k3b-data.files b/ubuntu/maverick/applications/k3b/debian/k3b-data.files
index 2bbfe5151..3b3a0add7 100644
--- a/ubuntu/maverick/applications/k3b/debian/k3b-data.files
+++ b/ubuntu/maverick/applications/k3b/debian/k3b-data.files
@@ -2,4 +2,4 @@ usr/share/apps/*
 usr/share/icons/*
 usr/share/kde/*
 usr/share/sounds/*
-usr/share/doc/kde/*
+usr/share/doc/tde/*
diff --git a/ubuntu/maverick/applications/k3b/debian/k3b-data.install b/ubuntu/maverick/applications/k3b/debian/k3b-data.install
index 0c6615e9b..b7175c514 100644
--- a/ubuntu/maverick/applications/k3b/debian/k3b-data.install
+++ b/ubuntu/maverick/applications/k3b/debian/k3b-data.install
@@ -1,7 +1,7 @@
 debian/tmp/usr/share/applnk/.hidden/*
 debian/tmp/usr/share/apps/*
 debian/tmp/usr/share/icons/*
-debian/tmp/usr/share/doc/kde/*
+debian/tmp/usr/share/doc/tde/*
 debian/tmp/usr/share/sounds/*
 debian/tmp/usr/share/mimelnk/*
 debian/tmp/usr/share/services/*
diff --git a/ubuntu/maverick/applications/kdesvn/debian/kdesvn-trinity.install b/ubuntu/maverick/applications/kdesvn/debian/kdesvn-trinity.install
index a222a6ad4..3b80f418f 100644
--- a/ubuntu/maverick/applications/kdesvn/debian/kdesvn-trinity.install
+++ b/ubuntu/maverick/applications/kdesvn/debian/kdesvn-trinity.install
@@ -9,5 +9,5 @@ debian/tmp/opt/trinity/share/icons/
 debian/tmp/opt/trinity/share/locale/*/LC_MESSAGES/*.mo
 debian/tmp/opt/trinity/share/config.kcfg/
 debian/tmp/opt/trinity/share/applications/kde/*.desktop
-debian/tmp/opt/trinity/share/doc/HTML/ /opt/trinity/share/doc/kde/
+debian/tmp/opt/trinity/share/doc/tde/
 
diff --git a/ubuntu/maverick/applications/kpicosim/debian/rules b/ubuntu/maverick/applications/kpicosim/debian/rules
index 130208334..135e084ba 100755
--- a/ubuntu/maverick/applications/kpicosim/debian/rules
+++ b/ubuntu/maverick/applications/kpicosim/debian/rules
@@ -92,7 +92,7 @@ install: build
 	 if test ! -d debian/$$pkg/opt/trinity/share/doc/tde; then \
 	 mkdir debian/$$pkg/opt/trinity/share/doc/tde; \
 	 fi; \
-	 mv debian/$$pkg/opt/trinity/share/doc/HTML debian/$$pkg/opt/trinity/share/doc/kde/; \
+	 mv debian/$$pkg/opt/trinity/share/doc/HTML debian/$$pkg/opt/trinity/share/doc/tde/; \
 	 fi; \
 	 if test -d debian/$$pkg/opt/trinity/share/doc/tde/HTML/en/$$pkg; then \
 	 dh_link -p$$pkg opt/trinity/share/doc/tde/HTML/en/$$pkg \