diff --git a/debian/lenny/applications/tdeio-sword/debian/cdbs/kde.mk b/debian/lenny/applications/tdeio-sword/debian/cdbs/kde.mk
index 7db11361b..80176d63e 100644
--- a/debian/lenny/applications/tdeio-sword/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/tdeio-sword/debian/cdbs/kde.mk
@@ -61,7 +61,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/tdeio-sword/debian/control b/debian/lenny/applications/tdeio-sword/debian/control
index aec969acd..7e7340fe9 100644
--- a/debian/lenny/applications/tdeio-sword/debian/control
+++ b/debian/lenny/applications/tdeio-sword/debian/control
@@ -2,7 +2,7 @@ Source: tdeio-sword-trinity
 Section: tde
 Priority: extra
 Maintainer: Raphaël Pinson <raphink@raphink.net>
-Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, automake, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libsword-dev (>= 1.5.8-1), tdelibs14-trinity-dev
+Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, cmake, libsword-dev (>= 1.5.8-1), tdelibs14-trinity-dev
 Standards-Version: 3.7.2
 
 Package: tdeio-sword-trinity
diff --git a/debian/lenny/applications/tdeio-sword/debian/docs b/debian/lenny/applications/tdeio-sword/debian/docs
index 5502ed8f4..c17f03764 100644
--- a/debian/lenny/applications/tdeio-sword/debian/docs
+++ b/debian/lenny/applications/tdeio-sword/debian/docs
@@ -1,3 +1,4 @@
+AUTHORS
 NEWS
 README
 TODO
diff --git a/debian/lenny/applications/tdeio-sword/debian/rules b/debian/lenny/applications/tdeio-sword/debian/rules
index 9314718f4..d8d772064 100755
--- a/debian/lenny/applications/tdeio-sword/debian/rules
+++ b/debian/lenny/applications/tdeio-sword/debian/rules
@@ -1,38 +1,20 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include debian/cdbs/kde.mk
-
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+include debian/cdbs/debian-qt-kde.mk
 
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-	dh_testdir
-
-	# Regenerate build system
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
-	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-
-	autoreconf --install && automake -f && \
-	$(MAKE) -f admin/Makefile.common && \
-	touch debian/stamp-bootstrap
-
-clean::
-	dh_testdir
-	rm -f debian/stamp-bootstrap
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/debian/squeeze/applications/tdeio-sword/debian/cdbs/kde.mk b/debian/squeeze/applications/tdeio-sword/debian/cdbs/kde.mk
index 7db11361b..80176d63e 100644
--- a/debian/squeeze/applications/tdeio-sword/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/tdeio-sword/debian/cdbs/kde.mk
@@ -61,7 +61,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/tdeio-sword/debian/control b/debian/squeeze/applications/tdeio-sword/debian/control
index aec969acd..7e7340fe9 100644
--- a/debian/squeeze/applications/tdeio-sword/debian/control
+++ b/debian/squeeze/applications/tdeio-sword/debian/control
@@ -2,7 +2,7 @@ Source: tdeio-sword-trinity
 Section: tde
 Priority: extra
 Maintainer: Raphaël Pinson <raphink@raphink.net>
-Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, automake, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libsword-dev (>= 1.5.8-1), tdelibs14-trinity-dev
+Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, cmake, libsword-dev (>= 1.5.8-1), tdelibs14-trinity-dev
 Standards-Version: 3.7.2
 
 Package: tdeio-sword-trinity
diff --git a/debian/squeeze/applications/tdeio-sword/debian/docs b/debian/squeeze/applications/tdeio-sword/debian/docs
index 5502ed8f4..c17f03764 100644
--- a/debian/squeeze/applications/tdeio-sword/debian/docs
+++ b/debian/squeeze/applications/tdeio-sword/debian/docs
@@ -1,3 +1,4 @@
+AUTHORS
 NEWS
 README
 TODO
diff --git a/debian/squeeze/applications/tdeio-sword/debian/rules b/debian/squeeze/applications/tdeio-sword/debian/rules
index 41a0fa49e..18b1c07e2 100755
--- a/debian/squeeze/applications/tdeio-sword/debian/rules
+++ b/debian/squeeze/applications/tdeio-sword/debian/rules
@@ -1,38 +1,20 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
 #include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include debian/cdbs/kde.mk
-
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+include debian/cdbs/debian-qt-kde.mk
 
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-	dh_testdir
-
-	# Regenerate build system
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
-	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-
-	autoreconf --install && automake -f && \
-	$(MAKE) -f admin/Makefile.common && \
-	touch debian/stamp-bootstrap
-
-clean::
-	dh_testdir
-	rm -f debian/stamp-bootstrap
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/ubuntu/maverick/applications/tdeio-sword/debian/cdbs/kde.mk b/ubuntu/maverick/applications/tdeio-sword/debian/cdbs/kde.mk
index 7db11361b..80176d63e 100644
--- a/ubuntu/maverick/applications/tdeio-sword/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/tdeio-sword/debian/cdbs/kde.mk
@@ -61,7 +61,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/ubuntu/maverick/applications/tdeio-sword/debian/control b/ubuntu/maverick/applications/tdeio-sword/debian/control
index aec969acd..7e7340fe9 100644
--- a/ubuntu/maverick/applications/tdeio-sword/debian/control
+++ b/ubuntu/maverick/applications/tdeio-sword/debian/control
@@ -2,7 +2,7 @@ Source: tdeio-sword-trinity
 Section: tde
 Priority: extra
 Maintainer: Raphaël Pinson <raphink@raphink.net>
-Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, automake, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libsword-dev (>= 1.5.8-1), tdelibs14-trinity-dev
+Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, cmake, libsword-dev (>= 1.5.8-1), tdelibs14-trinity-dev
 Standards-Version: 3.7.2
 
 Package: tdeio-sword-trinity
diff --git a/ubuntu/maverick/applications/tdeio-sword/debian/docs b/ubuntu/maverick/applications/tdeio-sword/debian/docs
index 5502ed8f4..c17f03764 100644
--- a/ubuntu/maverick/applications/tdeio-sword/debian/docs
+++ b/ubuntu/maverick/applications/tdeio-sword/debian/docs
@@ -1,3 +1,4 @@
+AUTHORS
 NEWS
 README
 TODO
diff --git a/ubuntu/maverick/applications/tdeio-sword/debian/rules b/ubuntu/maverick/applications/tdeio-sword/debian/rules
index 41a0fa49e..18b1c07e2 100755
--- a/ubuntu/maverick/applications/tdeio-sword/debian/rules
+++ b/ubuntu/maverick/applications/tdeio-sword/debian/rules
@@ -1,38 +1,20 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
 #include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include debian/cdbs/kde.mk
-
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+include debian/cdbs/debian-qt-kde.mk
 
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-	dh_testdir
-
-	# Regenerate build system
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
-	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-
-	autoreconf --install && automake -f && \
-	$(MAKE) -f admin/Makefile.common && \
-	touch debian/stamp-bootstrap
-
-clean::
-	dh_testdir
-	rm -f debian/stamp-bootstrap
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"