diff --git a/debian/_base/applications/tdeio/tdeio-locate/debian/control b/debian/_base/applications/tdeio/tdeio-locate/debian/control
index 060393b77..22a9bb10d 100644
--- a/debian/_base/applications/tdeio/tdeio-locate/debian/control
+++ b/debian/_base/applications/tdeio/tdeio-locate/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Tobi Vollebregt <tobivollebregt@gmail.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, bzip2, python-all
+Build-Depends: cdbs, debhelper (>= 9~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 
 Package: tdeio-locate-trinity
diff --git a/debian/_base/applications/tdeio/tdeio-locate/debian/rules b/debian/_base/applications/tdeio/tdeio-locate/debian/rules
index b9e54f6a9..a6797f19a 100755
--- a/debian/_base/applications/tdeio/tdeio-locate/debian/rules
+++ b/debian/_base/applications/tdeio/tdeio-locate/debian/rules
@@ -1,33 +1,17 @@
 #!/usr/bin/make -f
 
-# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function
-# Also include the main Trinity path
-ifeq ("$(LD_LIBRARY_PATH)", "")
-LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib
-else
-LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib
-endif
-export LD_LIBRARY_PATH
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
 include debian/cdbs/debian-tde.mk
 
-DEB_KDE_APIDOX := yes
-
-CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG)
-
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
- -DLIB_SUFFIX="" \
  -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
  -DCONFIG_INSTALL_DIR="/etc/trinity" \
  -DSYSCONF_INSTALL_DIR="/etc/trinity" \
  -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
- -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" \
- -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" \
- -DAUTODETECT_QT_DIRS="ON" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
  -DCMAKE_VERBOSE_MAKEFILE="ON" \
- -DBUILD_ALL="ON" \
  -DCMAKE_SKIP_RPATH="OFF" \
- -DCMAKE_BUILD_TYPE=RelWithDebInfo
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/ubuntu/_base/applications/tdeio/tdeio-locate/debian/control b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/control
index 86ec99090..e4f55d538 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-locate/debian/control
+++ b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Tobi Vollebregt <tobivollebregt@gmail.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, bzip2, python-all
+Build-Depends: cdbs, debhelper (>= 9~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 
 Package: tdeio-locate-trinity
diff --git a/ubuntu/_base/applications/tdeio/tdeio-locate/debian/rules b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/rules
index b9e54f6a9..a6797f19a 100755
--- a/ubuntu/_base/applications/tdeio/tdeio-locate/debian/rules
+++ b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/rules
@@ -1,33 +1,17 @@
 #!/usr/bin/make -f
 
-# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function
-# Also include the main Trinity path
-ifeq ("$(LD_LIBRARY_PATH)", "")
-LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib
-else
-LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib
-endif
-export LD_LIBRARY_PATH
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
 include debian/cdbs/debian-tde.mk
 
-DEB_KDE_APIDOX := yes
-
-CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG)
-
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
- -DLIB_SUFFIX="" \
  -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
  -DCONFIG_INSTALL_DIR="/etc/trinity" \
  -DSYSCONF_INSTALL_DIR="/etc/trinity" \
  -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
- -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" \
- -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" \
- -DAUTODETECT_QT_DIRS="ON" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
  -DCMAKE_VERBOSE_MAKEFILE="ON" \
- -DBUILD_ALL="ON" \
  -DCMAKE_SKIP_RPATH="OFF" \
- -DCMAKE_BUILD_TYPE=RelWithDebInfo
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"