diff --git a/debian/openerp.init b/debian/openerp.init
index 6abb6f10ed6..98e653298b2 100644
--- a/debian/openerp.init
+++ b/debian/openerp.init
@@ -17,55 +17,46 @@ DAEMON=/usr/bin/openerp-server
 NAME=openerp-server
 DESC=openerp-server
 CONFIG=/etc/openerp/openerp-server.conf
-LOGFILE=/var/log/openerp-server.log
+LOGFILE=/var/log/openerp/openerp-server.log
 USER=openerp
 
 test -x ${DAEMON} || exit 0
 
 set -e
 
+do_start () {
+    echo -n "Starting ${DESC}: "
+    start-stop-daemon --start --quiet --pidfile /var/run/${NAME}.pid --chuid ${USER} --background --make-pidfile --exec ${DAEMON} -- --config=${CONFIG} --logfile=${LOGFILE}
+    echo "${NAME}."
+}
+
+do_stop () {
+    echo -n "Stopping ${DESC}: "
+    start-stop-daemon --stop --quiet --pidfile /var/run/${NAME}.pid --oknodo
+    echo "${NAME}."
+}
+
 case "${1}" in
-	start)
-		echo -n "Starting ${DESC}: "
+    start)
+        do_start
+        ;;
 
-		start-stop-daemon --start --quiet --pidfile /var/run/${NAME}.pid \
-			--chuid ${USER} --background --make-pidfile \
-			--exec ${DAEMON} -- --config=${CONFIG} \
-			    --logfile=${LOGFILE}
+    stop)
+        do_stop
+        ;;
 
-		echo "${NAME}."
-		;;
+    restart|force-reload)
+        echo -n "Restarting ${DESC}: "
+        do_stop
+        sleep 1
+        do_start
+        ;;
 
-	stop)
-		echo -n "Stopping ${DESC}: "
-
-		start-stop-daemon --stop --quiet --pidfile /var/run/${NAME}.pid \
-			--oknodo
-
-		echo "${NAME}."
-		;;
-
-	restart|force-reload)
-		echo -n "Restarting ${DESC}: "
-
-		start-stop-daemon --stop --quiet --pidfile /var/run/${NAME}.pid \
-			--oknodo
-
-		sleep 1
-
-		start-stop-daemon --start --quiet --pidfile /var/run/${NAME}.pid \
-			--chuid ${USER} --background --make-pidfile \
-			--exec ${DAEMON} -- --config=${CONFIG} \
-			    --logfile=${LOGFILE}
-
-		echo "${NAME}."
-		;;
-
-	*)
-		N=/etc/init.d/${NAME}
-		echo "Usage: ${NAME} {start|stop|restart|force-reload}" >&2
-		exit 1
-		;;
+    *)
+        N=/etc/init.d/${NAME}
+        echo "Usage: ${NAME} {start|stop|restart|force-reload}" >&2
+        exit 1
+        ;;
 esac
 
 exit 0
diff --git a/debian/openerp.postinst b/debian/openerp.postinst
index 8700a259198..2eccd5111ec 100644
--- a/debian/openerp.postinst
+++ b/debian/openerp.postinst
@@ -12,9 +12,9 @@ case "${1}" in
         chown openerp:openerp /etc/openerp/openerp-server.conf
         chmod 0640 /etc/openerp/openerp-server.conf
         # Creating log file
-        touch /var/log/openerp-server.log
-        chown openerp:openerp /var/log/openerp-server.log
-        chmod 0640 /var/log/openerp-server.log
+        mkdir -p /var/log/openerp/
+        chown openerp:openerp /var/log/openerp
+        chmod 0750 /var/log/openerp
         # Creating local storage directory
         mkdir -p /var/lib/openerp/filestore
         chown openerp:openerp -R /var/lib/openerp