diff --git a/SOPE/sope-deb.diff b/SOPE/sope-deb.diff
index 27a5a7812..2ff157e83 100644
--- a/SOPE/sope-deb.diff
+++ b/SOPE/sope-deb.diff
@@ -1,3 +1,10 @@
+Index: debian/sope_SOPEVER_-versitsaxdriver.install
+===================================================================
+--- debian/sope_SOPEVER_-versitsaxdriver.install  (revision 1660)
++++ debian/sope_SOPEVER_-versitsaxdriver.install  (working copy)
+@@ -1 +1,2 @@
+ usr/lib/sope-*/saxdrivers/versitSaxDriver.sax
++usr/lib/GNUstep/SaxDrivers-4.9/versitSaxDriver.sax
 Index: debian/control
 ===================================================================
 --- debian/control	(revision 1660)
@@ -38,6 +45,14 @@ Index: debian/libsope-gdl1-_SOPEVER_-dev.install
 -usr/include/GDLAccess
 +usr/include/GNUstep/GDLAccess
  usr/lib/libGDLAccess.so
+Index: debian/sope_SOPEVER_-appserver.install
+===================================================================
+--- debian/sope_SOPEVER_-appserver.install  (revision 1660)
++++ debian/sope_SOPEVER_-appserver.install  (working copy)
+@@ -1 +1,2 @@
+-usr/sbin/sope-*
++usr/lib/GNUstep/SoProducts-4.9
++usr/lib/GNUstep/WOxElemBuilders-4.9
 Index: debian/control.in
 ===================================================================
 --- debian/control.in	(revision 1660)
@@ -93,6 +108,31 @@ Index: debian/libsope-ical_SOPEVER_-dev.install
 -usr/include/NGiCal
 +usr/include/GNUstep/NGiCal
  usr/lib/libNGiCal.so
+Index: debian/sope_SOPEVER_-libxmlsaxdriver.install
+===================================================================
+--- debian/sope_SOPEVER_-libxmlsaxdriver.install  (revision 1660)
++++ debian/sope_SOPEVER_-libxmlsaxdriver.install  (working copy)
+@@ -1 +1,2 @@
+ usr/lib/sope-*/saxdrivers/libxmlSAXDriver.sax
++usr/lib/GNUstep/SaxDrivers-4.9/libxmlSAXDriver.sax
+Index: debian/libsope-appserver_SOPEVER_.install
+===================================================================
+--- debian/libsope-appserver_SOPEVER_.install (revision 1660)
++++ debian/libsope-appserver_SOPEVER_.install (working copy)
+@@ -6,5 +6,6 @@
+ usr/lib/libSoOFS.so.*
+ usr/lib/libWEPrototype.so.*
+ usr/share/sope-*/ngobjweb
++usr/lib/GNUstep/Libraries/Resources/NGObjWeb
+ usr/lib/sope-*/products
+ usr/lib/sope-*/wox-builders
+Index: debian/sope_SOPEVER_-stxsaxdriver.install
+===================================================================
+--- debian/sope_SOPEVER_-stxsaxdriver.install (revision 1660)
++++ debian/sope_SOPEVER_-stxsaxdriver.install (working copy)
+@@ -1 +1,2 @@
+ usr/lib/sope-*/saxdrivers/STXSaxDriver.sax
++usr/lib/GNUstep/SaxDrivers-4.9/STXSaxDriver.sax
 Index: debian/rules
 ===================================================================
 --- debian/rules	(revision 1660)
@@ -176,6 +216,13 @@ Index: debian/libsope-ldap_SOPEVER_-dev.install
 -usr/include/NGLdap
 +usr/include/GNUstep/NGLdap
  usr/lib/libNGLdap.so
+Index: debian/sope_SOPEVER_-gdl1-postgresql.install
+===================================================================
+--- debian/sope_SOPEVER_-gdl1-postgresql.install  (revision 1660)
++++ debian/sope_SOPEVER_-gdl1-postgresql.install  (working copy)
+@@ -1 +1 @@
+-usr/lib/sope-*/dbadaptors/PostgreSQL.gdladaptor
++usr/lib/GNUstep/GDLAdaptors-4.9/PostgreSQL.gdladaptor
 Index: debian/libsope-mime_SOPEVER_-dev.install
 ===================================================================
 --- debian/libsope-mime_SOPEVER_-dev.install	(revision 1660)
diff --git a/Scripts/sogod-wrapper b/Scripts/sogod-wrapper
index bb2eeb5be..5271d5fe5 100755
--- a/Scripts/sogod-wrapper
+++ b/Scripts/sogod-wrapper
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # SOGo daemon wrapper
 #
@@ -50,6 +50,7 @@ else
     echo "Can't find sogod"
     exit 1
 fi
+echo $sogod
 
 if [ -f $GNUSTEP_MAKEFILES/GNUstep.sh ]; then
     . $GNUSTEP_MAKEFILES/GNUstep.sh
diff --git a/debian/control b/debian/control
index 14fa1a7eb..92b65ab48 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.7.3
 Package: sogo
 Section: web
 Architecture: i386
-Depends: gnustep-base-common, gnustep-base-runtime, libsope-core4.9, libsope-appserver4.9, libsope-ldap4.9
+Depends: gnustep-base-common, gnustep-base-runtime, gnustep-gui-common, gnustep-gui-runtime, libsope-core4.9, libsope-appserver4.9, libsope-ldap4.9
 Description: SOGo
  SOGo is a groupware server built around OpenGroupware.org (OGo) and
  the SOPE application server.  It focuses on scalability.
diff --git a/debian/rules b/debian/rules
index 8e2c65928..a6f2210a9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,13 +54,11 @@ install-arch:
 	mkdir -p debian/tmp/etc/default
 	mkdir -p debian/tmp/etc/apache2/conf.d
 	mkdir -p debian/tmp/usr/sbin
-	mkdir -p debian/tmp/usr/share/GNUstep/Tools
-	echo "DAEMON=/usr/sbin/sogod" >> debian/tmp/etc/default/sogo
+	echo "DAEMON=/usr/sbin/sogod-launcher" >> debian/tmp/etc/default/sogo
 	cp Scripts/sogo-init.d-debian debian/tmp/etc/init.d/sogod
 	cp Scripts/tmpwatch debian/tmp/etc/cron.daily/sogo-tmpwatch
-	cp Apache/SOGo.conf debian/tmp/etc/apache2/conf.d/
-	mv debian/tmp/usr/sbin/sogod debian/tmp/usr/share/GNUstep/Tools
-	cp Scripts/sogod-wrapper debian/tmp/usr/sbin/sogod
+	cp Apache/SOGo-debian.conf debian/tmp/etc/apache2/conf.d/SOGo.conf
+	cp Scripts/sogod-wrapper debian/tmp/usr/sbin/sogod-launcher
 
 	dh_install -s
 
diff --git a/debian/sogo.postinst b/debian/sogo.postinst
index 35cac7bd0..ab3f537d6 100755
--- a/debian/sogo.postinst
+++ b/debian/sogo.postinst
@@ -7,7 +7,7 @@ USERS=`getent passwd | grep sogo | sed -e 's/\([a-zA-Z]*\):.*/\1/g'`
 
 if [ "$USERS" != "sogo" ] ; then
   echo "Adding user sogo"
-  useradd -d /tmp -g sogo -K UID_MIN=100 -K UID_MAX=500 -K PASS_MAX_DAYS=-1 -s /bin/false sogo
+  useradd -d /home/sogo -g sogo -m -K UID_MIN=100 -K UID_MAX=500 -K PASS_MAX_DAYS=-1 -s /bin/bash sogo
 fi
 
 chown -R sogo /var/run/sogo