diff --git a/debian/_base/core/tdeartwork/debian/rules b/debian/_base/core/tdeartwork/debian/rules
index 5d38f08b6..753e97397 100755
--- a/debian/_base/core/tdeartwork/debian/rules
+++ b/debian/_base/core/tdeartwork/debian/rules
@@ -23,6 +23,8 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_VERBOSE_MAKEFILE="ON" \
  -DCMAKE_SKIP_RPATH="OFF" \
  -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON" \
+ -DWITH_ALL_INCLUDED_XSCREENSAVERS="ON" \
  -DWITH_ARTS="ON"
 
 DEB_DH_STRIP_ARGS  := --dbg-package=tdeartwork-trinity-dbg
diff --git a/debian/_base/core/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install b/debian/_base/core/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install
index 3f7f191ef..dd2868cf0 100644
--- a/debian/_base/core/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install
+++ b/debian/_base/core/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install
@@ -1 +1 @@
-tdescreensaver/kxsconfig/ScreenSavers/* opt/trinity/share/applnk/System/ScreenSavers/
+obj-*/tdescreensaver/kxsconfig/ScreenSavers/*.desktop opt/trinity/share/applnk/System/ScreenSavers/
diff --git a/dilos/core/tdeartwork/debian/rules b/dilos/core/tdeartwork/debian/rules
index 5d2605563..9ab3bb10e 100755
--- a/dilos/core/tdeartwork/debian/rules
+++ b/dilos/core/tdeartwork/debian/rules
@@ -22,6 +22,8 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_VERBOSE_MAKEFILE="ON" \
  -DCMAKE_SKIP_RPATH="OFF" \
  -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON" \
+ -DWITH_ALL_INCLUDED_XSCREENSAVERS="ON" \
  -DWITH_ARTS="ON" \
  -DCMAKE_C_COMPILER=gcc \
  -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)"
diff --git a/dilos/core/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install b/dilos/core/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install
index 65da0bfe4..e1848f246 100644
--- a/dilos/core/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install
+++ b/dilos/core/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install
@@ -1 +1 @@
-tdescreensaver/kxsconfig/ScreenSavers/* usr/share/applnk/System/ScreenSavers/
+obj-*/tdescreensaver/kxsconfig/ScreenSavers/*.desktop usr/share/applnk/System/ScreenSavers/
diff --git a/ubuntu/_base/core/tdeartwork/debian/rules b/ubuntu/_base/core/tdeartwork/debian/rules
index 5d38f08b6..753e97397 100755
--- a/ubuntu/_base/core/tdeartwork/debian/rules
+++ b/ubuntu/_base/core/tdeartwork/debian/rules
@@ -23,6 +23,8 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_VERBOSE_MAKEFILE="ON" \
  -DCMAKE_SKIP_RPATH="OFF" \
  -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON" \
+ -DWITH_ALL_INCLUDED_XSCREENSAVERS="ON" \
  -DWITH_ARTS="ON"
 
 DEB_DH_STRIP_ARGS  := --dbg-package=tdeartwork-trinity-dbg
diff --git a/ubuntu/_base/core/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install b/ubuntu/_base/core/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install
index 3f7f191ef..dd2868cf0 100644
--- a/ubuntu/_base/core/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install
+++ b/ubuntu/_base/core/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install
@@ -1 +1 @@
-tdescreensaver/kxsconfig/ScreenSavers/* opt/trinity/share/applnk/System/ScreenSavers/
+obj-*/tdescreensaver/kxsconfig/ScreenSavers/*.desktop opt/trinity/share/applnk/System/ScreenSavers/