diff --git a/debian/lenny/applications/tdesvn/debian/libsvnqt-trinity-dev.install b/debian/lenny/applications/tdesvn/debian/libsvnqt-trinity-dev.install
index 798378e12..fb3c81018 100644
--- a/debian/lenny/applications/tdesvn/debian/libsvnqt-trinity-dev.install
+++ b/debian/lenny/applications/tdesvn/debian/libsvnqt-trinity-dev.install
@@ -1,2 +1,2 @@
 debian/tmp/opt/trinity/lib*/*.so
-debian/tmp/opt/trinity/include/kde/svnqt/
+debian/tmp/opt/trinity/include/svnqt/
diff --git a/debian/lenny/applications/tdesvn/debian/tdesvn-kio-plugins-trinity.install b/debian/lenny/applications/tdesvn/debian/tdesvn-kio-plugins-trinity.install
index 32155110b..edba29129 100644
--- a/debian/lenny/applications/tdesvn/debian/tdesvn-kio-plugins-trinity.install
+++ b/debian/lenny/applications/tdesvn/debian/tdesvn-kio-plugins-trinity.install
@@ -1,4 +1,4 @@
 debian/tmp/opt/trinity/share/services/*.protocol
-debian/tmp/opt/trinity/lib/kio*
-debian/tmp/opt/trinity/lib/kded_tdesvnd.*
+debian/tmp/opt/trinity/lib/trinity/kio*
+debian/tmp/opt/trinity/lib/trinity/kded_tdesvnd.*
 debian/tmp/opt/trinity/share/services/kded/
diff --git a/debian/lenny/applications/tdesvn/debian/tdesvn-trinity.install b/debian/lenny/applications/tdesvn/debian/tdesvn-trinity.install
index f3c840c12..348be90e8 100644
--- a/debian/lenny/applications/tdesvn/debian/tdesvn-trinity.install
+++ b/debian/lenny/applications/tdesvn/debian/tdesvn-trinity.install
@@ -1,6 +1,7 @@
 debian/icons/tdesvn.xpm	/opt/trinity/share/pixmaps/
 debian/tmp/opt/trinity/bin/
-debian/tmp/opt/trinity/lib/libtdesvnpart.*
+debian/tmp/opt/trinity/lib/*.so*
+debian/tmp/opt/trinity/lib/trinity/tdesvnpart*
 debian/tmp/opt/trinity/share/apps/tdesvn/
 debian/tmp/opt/trinity/share/apps/tdesvnpart/
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/
@@ -9,5 +10,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/kde/
 
diff --git a/debian/squeeze/applications/tdesvn/debian/libsvnqt-trinity-dev.install b/debian/squeeze/applications/tdesvn/debian/libsvnqt-trinity-dev.install
index 798378e12..fb3c81018 100644
--- a/debian/squeeze/applications/tdesvn/debian/libsvnqt-trinity-dev.install
+++ b/debian/squeeze/applications/tdesvn/debian/libsvnqt-trinity-dev.install
@@ -1,2 +1,2 @@
 debian/tmp/opt/trinity/lib*/*.so
-debian/tmp/opt/trinity/include/kde/svnqt/
+debian/tmp/opt/trinity/include/svnqt/
diff --git a/debian/squeeze/applications/tdesvn/debian/tdesvn-kio-plugins-trinity.install b/debian/squeeze/applications/tdesvn/debian/tdesvn-kio-plugins-trinity.install
index 32155110b..edba29129 100644
--- a/debian/squeeze/applications/tdesvn/debian/tdesvn-kio-plugins-trinity.install
+++ b/debian/squeeze/applications/tdesvn/debian/tdesvn-kio-plugins-trinity.install
@@ -1,4 +1,4 @@
 debian/tmp/opt/trinity/share/services/*.protocol
-debian/tmp/opt/trinity/lib/kio*
-debian/tmp/opt/trinity/lib/kded_tdesvnd.*
+debian/tmp/opt/trinity/lib/trinity/kio*
+debian/tmp/opt/trinity/lib/trinity/kded_tdesvnd.*
 debian/tmp/opt/trinity/share/services/kded/
diff --git a/debian/squeeze/applications/tdesvn/debian/tdesvn-trinity.install b/debian/squeeze/applications/tdesvn/debian/tdesvn-trinity.install
index f3c840c12..348be90e8 100644
--- a/debian/squeeze/applications/tdesvn/debian/tdesvn-trinity.install
+++ b/debian/squeeze/applications/tdesvn/debian/tdesvn-trinity.install
@@ -1,6 +1,7 @@
 debian/icons/tdesvn.xpm	/opt/trinity/share/pixmaps/
 debian/tmp/opt/trinity/bin/
-debian/tmp/opt/trinity/lib/libtdesvnpart.*
+debian/tmp/opt/trinity/lib/*.so*
+debian/tmp/opt/trinity/lib/trinity/tdesvnpart*
 debian/tmp/opt/trinity/share/apps/tdesvn/
 debian/tmp/opt/trinity/share/apps/tdesvnpart/
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/
@@ -9,5 +10,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/kde/
 
diff --git a/ubuntu/maverick/applications/tdesvn/debian/libsvnqt-trinity-dev.install b/ubuntu/maverick/applications/tdesvn/debian/libsvnqt-trinity-dev.install
index 798378e12..fb3c81018 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/libsvnqt-trinity-dev.install
+++ b/ubuntu/maverick/applications/tdesvn/debian/libsvnqt-trinity-dev.install
@@ -1,2 +1,2 @@
 debian/tmp/opt/trinity/lib*/*.so
-debian/tmp/opt/trinity/include/kde/svnqt/
+debian/tmp/opt/trinity/include/svnqt/
diff --git a/ubuntu/maverick/applications/tdesvn/debian/tdesvn-kio-plugins-trinity.install b/ubuntu/maverick/applications/tdesvn/debian/tdesvn-kio-plugins-trinity.install
index 32155110b..edba29129 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/tdesvn-kio-plugins-trinity.install
+++ b/ubuntu/maverick/applications/tdesvn/debian/tdesvn-kio-plugins-trinity.install
@@ -1,4 +1,4 @@
 debian/tmp/opt/trinity/share/services/*.protocol
-debian/tmp/opt/trinity/lib/kio*
-debian/tmp/opt/trinity/lib/kded_tdesvnd.*
+debian/tmp/opt/trinity/lib/trinity/kio*
+debian/tmp/opt/trinity/lib/trinity/kded_tdesvnd.*
 debian/tmp/opt/trinity/share/services/kded/
diff --git a/ubuntu/maverick/applications/tdesvn/debian/tdesvn-trinity.install b/ubuntu/maverick/applications/tdesvn/debian/tdesvn-trinity.install
index f3c840c12..348be90e8 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/tdesvn-trinity.install
+++ b/ubuntu/maverick/applications/tdesvn/debian/tdesvn-trinity.install
@@ -1,6 +1,7 @@
 debian/icons/tdesvn.xpm	/opt/trinity/share/pixmaps/
 debian/tmp/opt/trinity/bin/
-debian/tmp/opt/trinity/lib/libtdesvnpart.*
+debian/tmp/opt/trinity/lib/*.so*
+debian/tmp/opt/trinity/lib/trinity/tdesvnpart*
 debian/tmp/opt/trinity/share/apps/tdesvn/
 debian/tmp/opt/trinity/share/apps/tdesvnpart/
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/
@@ -9,5 +10,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/kde/