diff --git a/debian/patches/config-debian.diff b/debian/patches/config-debian.diff
index 4d4a2169..b21a78d1 100644
--- a/debian/patches/config-debian.diff
+++ b/debian/patches/config-debian.diff
@@ -7,7 +7,7 @@ Index: postfixadmin/config.inc.php
   */
  
 +// Debian: This loads the automatic generated DB credentials from /etc/postfixadmin/dbconfig.inc.php
-+require_once('dbconfig.inc.php');
++require_once(dirname(__FILE__) . '/dbconfig.inc.php');
 +if (!isset($dbserver) || empty($dbserver)) {
 +    $dbserver = 'localhost';
 +}
diff --git a/debian/postfixadmin.dirs b/debian/postfixadmin.dirs
index 4a30bd73..ae48e1cb 100644
--- a/debian/postfixadmin.dirs
+++ b/debian/postfixadmin.dirs
@@ -2,4 +2,6 @@ usr/share/postfixadmin
 usr/share/postfixadmin/scripts
 usr/share/postfixadmin/css
 usr/share/doc/postfixadmin
+var/cache/postfixadmin
+usr/bin
 etc/postfixadmin
diff --git a/debian/postfixadmin.links b/debian/postfixadmin.links
index 1e1fd78c..e2d3c91c 100644
--- a/debian/postfixadmin.links
+++ b/debian/postfixadmin.links
@@ -1,2 +1,2 @@
 etc/postfixadmin/config.inc.php usr/share/postfixadmin/config.inc.php
-usr/bin/postfixadmin-cli usr/share/postfixadmin/scripts/postfixadmin-cli.php
+var/cache/postfixadmin usr/share/postfixadmin/templates_c
diff --git a/debian/postfixadmin.postinst b/debian/postfixadmin.postinst
index 40dae04d..76967872 100644
--- a/debian/postfixadmin.postinst
+++ b/debian/postfixadmin.postinst
@@ -23,6 +23,12 @@ fi
 if [ -d /usr/share/postfixadmin/templates_c ]; then
     find /usr/share/postfixadmin/templates_c -type f -exec rm -r {} \;
 fi
+
+if [ -d /var/cache/postfixadmin ]; then
+    find /var/cache/postfixadmin -type f -exec rm -r {} \;
+    chown www-data /var/cache/postfixadmin
+fi
+
 #DEBHELPER#
 
 exit 0
diff --git a/debian/postfixadmin.prerm b/debian/postfixadmin.prerm
index 3b553f1e..27a398a4 100644
--- a/debian/postfixadmin.prerm
+++ b/debian/postfixadmin.prerm
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 set -e
 
 . /usr/share/debconf/confmodule
diff --git a/debian/rules b/debian/rules
index 6f631941..7ba9c433 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,7 @@ install: build
 	dh_install
 	dh_apache2
 	mv debian/postfixadmin/usr/share/postfixadmin/config.inc.php debian/postfixadmin/etc/postfixadmin/config.inc.php
-	find debian/postfixadmin -name .svn | xargs -r rm -r
+	ln -s /usr/share/postfixadmin/scripts/postfixadmin-cli debian/postfixadmin/usr/bin/postfixadmin-cli
 
 # Build architecture-independent files here.
 binary-indep: build install