diff --git a/debian/bareos-common.dirs b/debian/bareos-common.dirs
index ec4c469d94d..80f0fa2f5b4 100644
--- a/debian/bareos-common.dirs
+++ b/debian/bareos-common.dirs
@@ -1 +1,2 @@
 /var/lib/bareos
+/var/log/bareos
\ No newline at end of file
diff --git a/debian/bareos-common.postinst b/debian/bareos-common.postinst
index a08c32a3052..2aa60ac2704 100644
--- a/debian/bareos-common.postinst
+++ b/debian/bareos-common.postinst
@@ -23,6 +23,7 @@ daemon_group=bareos
 permissions()
 {
   chown ${daemon_user}:${daemon_group} /var/lib/bareos/
+  chown ${daemon_user}:${daemon_group} /var/log/bareos/
 }
 
 case "$1" in
diff --git a/debian/bareos-director.install b/debian/bareos-director.install
index c3b3d181aef..72681f00b23 100644
--- a/debian/bareos-director.install
+++ b/debian/bareos-director.install
@@ -1,5 +1,6 @@
 /etc/bareos/bareos-dir.conf
 /etc/logrotate.d/bareos-dir
+/etc/init.d/bareos-dir
 /usr/lib/bareos/scripts/delete_catalog_backup
 /usr/lib/bareos/scripts/make_catalog_backup
 /usr/lib/bareos/scripts/make_catalog_backup.pl
@@ -9,4 +10,3 @@
 /usr/share/man/man1/bsmtp.1.gz
 /usr/share/man/man8/bareos-dir.8.gz
 /usr/share/man/man8/bareos.8.gz
-platforms/debian/bareos-dir /etc/init.d/
diff --git a/debian/bareos-filedaemon.install b/debian/bareos-filedaemon.install
index 34ce1350065..8efd5e4bd6b 100644
--- a/debian/bareos-filedaemon.install
+++ b/debian/bareos-filedaemon.install
@@ -1,6 +1,6 @@
 /etc/bareos/bareos-fd.conf
+/etc/init.d/bareos-fd
 /usr/sbin/bareos-fd
 /usr/lib/bareos/plugins/bpipe-fd.so
 /usr/lib/bareos/plugins/python-fd.so
 /usr/share/man/man8/bareos-fd.8.gz
-platforms/debian/bareos-fd /etc/init.d/
diff --git a/debian/bareos-storage.dirs b/debian/bareos-storage.dirs
new file mode 100644
index 00000000000..005ad2e0940
--- /dev/null
+++ b/debian/bareos-storage.dirs
@@ -0,0 +1 @@
+/var/lib/bareos/storage
diff --git a/debian/bareos-storage.install b/debian/bareos-storage.install
index 8f99f8ba8ec..5c6cc3f19af 100644
--- a/debian/bareos-storage.install
+++ b/debian/bareos-storage.install
@@ -1,5 +1,6 @@
 /etc/bareos/bareos-sd.conf
 /etc/bareos/mtx-changer.conf
+/etc/init.d/bareos-sd
 /usr/sbin/bscrypto
 /usr/lib/bareos/plugins/python-sd.so
 /usr/lib/bareos/plugins/scsicrypto-sd.so
@@ -10,4 +11,3 @@
 /usr/share/man/man8/bareos-sd.8.gz
 /usr/share/man/man8/btape.8.gz
 /usr/sbin/btape
-platforms/debian/bareos-sd /etc/init.d/
diff --git a/debian/bareos-storage.postinst b/debian/bareos-storage.postinst
index 4940c096334..3b06b210f69 100644
--- a/debian/bareos-storage.postinst
+++ b/debian/bareos-storage.postinst
@@ -29,6 +29,7 @@ storage_daemon_group=$daemon_group
 permissions()
 {
   chown ${storage_daemon_user}:${daemon_group} /etc/bareos/bareos-sd.conf
+  chown ${storage_daemon_user}:${daemon_group} /var/lib/bareos/storage/
 }
 
 case "$1" in
diff --git a/debian/control b/debian/control
index fde58ef221a..232fdd658e8 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,7 @@ Build-Depends: autotools-dev, debhelper (>= 7.0.50~),
  libcap-dev,
  libssl-dev,
  liblzo2-dev,
+ lsb-release,
  ncurses-dev
 # removed to be compliant with Ubuntu:
 # libsqlite0-dev,
diff --git a/debian/rules b/debian/rules
index 154d1db4206..fcc986abcd2 100644
--- a/debian/rules
+++ b/debian/rules
@@ -30,12 +30,13 @@ override_dh_auto_configure:
 	dh_auto_configure --    \
   --with-sbin-perm=755 \
   --sysconfdir=/etc/bareos \
-  --docdir=\${_docdir}/bareos \
-  --htmldir=\${_docdir}/bareos/html \
+  --with-archivedir=/var/lib/bareos/storage \
   --with-scriptdir=/usr/lib/bareos/scripts \
   --with-plugindir=/usr/lib/bareos/plugins \
   --with-working-dir=/var/lib/bareos \
   --with-pid-dir=/var/lib/bareos \
+  --with-bsrdir=/var/lib/bareos \
+  --with-logdir=/var/log/bareos \
   --with-subsys-dir=/var/lock \
   --enable-smartalloc \
   --disable-conio \
@@ -68,6 +69,10 @@ override_dh_auto_configure:
   --with-hostname="XXX_REPLACE_WITH_LOCAL_HOSTNAME_XXX" \
   --enable-includes
 
+#  --docdir="\${_docdir}/bareos" \
+#  --htmldir="\${_docdir}/bareos/html" \
+
+
 override_dh_fixperms:
 	# all files in /etc/bareos
 	dh_fixperms \
diff --git a/platforms/deb/bareos-Debian_6.0.dsc b/platforms/deb/bareos-Debian_6.0.dsc
index 8f24cb08267..d5db575b4f6 100644
--- a/platforms/deb/bareos-Debian_6.0.dsc
+++ b/platforms/deb/bareos-Debian_6.0.dsc
@@ -6,6 +6,6 @@ Version: 12.4.1
 Maintainer: Joerg Steffens <joerg.steffens@bareos.com>
 Homepage: http://www.bareos.org/
 Standards-Version: 3.8.4
-Build-Depends: autotools-dev, debhelper (>= 7.0.50~), po-debconf (>= 0.8.2), hostname, zlib1g-dev, libreadline-dev, libjconv-dev, libsqlite3-dev, libmysqlclient-dev, libpq-dev (>= 8.4), postgresql-server-dev-8.4, libwrap0-dev, python-dev, libgtk2.0-dev (>= 2.10), libgnome2-dev, libacl1-dev, libkrb5-dev, libgnomeui-dev, libx11-dev, mtx, bc, libxt-dev, dpkg-dev (>= 1.13.19), libqt4-dev, acl-dev, libcap-dev, libssl-dev, liblzo2-dev, ncurses-dev
+Build-Depends: autotools-dev, debhelper (>= 7.0.50~), po-debconf (>= 0.8.2), hostname, zlib1g-dev, libreadline-dev, libjconv-dev, libsqlite3-dev, libmysqlclient-dev, libpq-dev (>= 8.4), postgresql-server-dev-8.4, libwrap0-dev, python-dev, libgtk2.0-dev (>= 2.10), libgnome2-dev, libacl1-dev, libkrb5-dev, libgnomeui-dev, libx11-dev, mtx, bc, libxt-dev, dpkg-dev (>= 1.13.19), libqt4-dev, acl-dev, libcap-dev, libssl-dev, liblzo2-dev, lsb-release, ncurses-dev
 Build-Conflicts: python2.2-dev, python2.3, python2.4, qt3-dev-tools
 Files:
diff --git a/platforms/deb/bareos-xUbuntu_12.04.dsc b/platforms/deb/bareos-xUbuntu_12.04.dsc
index 60fc301063b..54c003f5417 100644
--- a/platforms/deb/bareos-xUbuntu_12.04.dsc
+++ b/platforms/deb/bareos-xUbuntu_12.04.dsc
@@ -6,7 +6,7 @@ Version: 12.4.1
 Maintainer: Joerg Steffens <joerg.steffens@bareos.com>
 Homepage: http://www.bareos.org/
 Standards-Version: 3.8.4
-Build-Depends: autotools-dev, debhelper (>= 7.0.50~), po-debconf (>= 0.8.2), hostname, zlib1g-dev, libreadline-dev, libsqlite3-dev, libmysqlclient-dev, libpq-dev (>= 8.4), postgresql-server-dev-9.1, libwrap0-dev, python-dev, libgtk2.0-dev (>= 2.10), libgnome2-dev, libacl1-dev, libkrb5-dev, libgnomeui-dev, libx11-dev, mtx, bc, libxt-dev, dpkg-dev (>= 1.13.19), libqt4-dev, acl-dev, libcap-dev, libssl-dev, liblzo2-dev, ncurses-dev
+Build-Depends: autotools-dev, debhelper (>= 7.0.50~), po-debconf (>= 0.8.2), hostname, zlib1g-dev, libreadline-dev, libsqlite3-dev, libmysqlclient-dev, libpq-dev (>= 8.4), postgresql-server-dev-9.1, libwrap0-dev, python-dev, libgtk2.0-dev (>= 2.10), libgnome2-dev, libacl1-dev, libkrb5-dev, libgnomeui-dev, libx11-dev, mtx, bc, libxt-dev, dpkg-dev (>= 1.13.19), libqt4-dev, acl-dev, libcap-dev, libssl-dev, liblzo2-dev, lsb-release, ncurses-dev
 # libjconv-dev,
 Build-Conflicts: python2.2-dev, python2.3, python2.4, qt3-dev-tools
 Files:
diff --git a/platforms/debian/bareos-dir.in b/platforms/debian/bareos-dir.in
index 8204aff44fd..2286dca6bbf 100644
--- a/platforms/debian/bareos-dir.in
+++ b/platforms/debian/bareos-dir.in
@@ -48,25 +48,31 @@ if [ "x${BUSER}" != "x" ]; then
    fi
 fi
 
+# define LSB functions.
+. /lib/lsb/init-functions
+
 case "$1" in
-   start)
-      echo -n "Starting ${DESC}: "
-      start-stop-daemon --start --quiet --pidfile ${PIDFILE} ${USERGRP} --exec ${DAEMON} -- ${BOPTIONS}
-      RETVAL=$?
-      echo "${NAME}"
-      ;;
-   stop)
+    start)
+        log_daemon_msg "Starting $DESC" "$NAME"
+        start-stop-daemon --start --quiet --pidfile ${PIDFILE} ${USERGRP} --exec ${DAEMON} -- ${BOPTIONS}
+        log_end_msg $?
+        sleep 2
+        ;;
+    stop)
       echo -n "Stopping ${DESC}: "
       start-stop-daemon --oknodo --stop --quiet ${USERGRP} --exec ${DAEMON} -- ${BOPTIONS}
       RETVAL=$?
       echo "${NAME}"
       ;;
-   restart|force-reload)
+    restart|force-reload)
       $0 stop
       sleep 5
       $0 start
       ;;
-   *)
+    status)
+        status_of_proc -p ${PIDFILE} ${DAEMON} ${NAME} && exit 0 || exit $?
+        ;;
+    *)
       echo "Usage: /etc/init.d/${NAME} {start|stop|restart|force-reload}" >&2
       exit 1
       ;;
diff --git a/platforms/rpms/bareos.spec b/platforms/rpms/bareos.spec
index 88247674958..7ce1e13ddbf 100644
--- a/platforms/rpms/bareos.spec
+++ b/platforms/rpms/bareos.spec
@@ -48,6 +48,7 @@ Vendor: 	The Bareos Team
 %define script_dir     /usr/lib/bareos/scripts
 %define working_dir    /var/lib/bareos
 %define pid_dir        /var/lib/bareos
+%define bsr_dir        /var/lib/bareos
 # TODO: use /run ?
 %define _subsysdir     /var/lock
 
@@ -426,10 +427,13 @@ export MTX=/usr/sbin/mtx
   --mandir=%{_mandir} \
   --docdir=%{_docdir}/%{name} \
   --htmldir=%{_docdir}/%{name}/html \
+  --with-archivedir=/var/lib/bareos/storage \
   --with-scriptdir=%{script_dir} \
   --with-working-dir=%{working_dir} \
   --with-plugindir=%{plugin_dir} \
   --with-pid-dir=%{pid_dir} \
+  --with-bsrdir=%{bsr_dir} \
+  --with-logdir=%{_logdir}/bareos \
   --with-subsys-dir=%{_subsysdir} \
   --enable-smartalloc \
   --disable-conio \
diff --git a/platforms/ubuntu/bareos-dir.in b/platforms/ubuntu/bareos-dir.in
index 4492fbf0c42..1ebcf1df450 100644
--- a/platforms/ubuntu/bareos-dir.in
+++ b/platforms/ubuntu/bareos-dir.in
@@ -10,13 +10,13 @@
 #
 
 ### BEGIN INIT INFO
-# Provides:		bareos-dir
-# Required-Start:	$local_fs $remote_fs $network $time
-# Required-Stop:	$local_fs $remote_fs $network $time
-# Default-Start:	2 3 4 5
-# Default-Stop: 	0 1 6
-# Short-Description:	Bareos Director
-# Description:		Bareos is a network backup and restore program
+# Provides:		      bareos-dir
+# Required-Start:	  $local_fs $remote_fs $network $time
+# Required-Stop:	  $local_fs $remote_fs $network $time
+# Default-Start:      2 3 4 5
+# Default-Stop:       0 1 6
+# Short-Description:  Bareos Director
+# Description:		  Bareos is a network backup and restore program
 ### END INIT INFO
 
 
@@ -56,25 +56,31 @@ if [ "x${BUSER}" != "x" ]; then
    fi
 fi
 
+# define LSB functions.
+. /lib/lsb/init-functions
+
 case "$1" in
-   start)
-      echo -n "Starting ${DESC}: "
-      start-stop-daemon --start --quiet --pidfile ${PIDFILE} ${USERGRP} --exec ${DAEMON} -- ${BOPTIONS}
-      RETVAL=$?
-      echo "${NAME}"
-      ;;
-   stop)
+    start)
+        log_daemon_msg "Starting $DESC" "$NAME"
+        start-stop-daemon --start --quiet --pidfile ${PIDFILE} ${USERGRP} --exec ${DAEMON} -- ${BOPTIONS}
+        log_end_msg $?
+        sleep 2
+        ;;
+    stop)
       echo -n "Stopping ${DESC}: "
-      start-stop-daemon --oknodo --stop --quiet  ${USERGRP} --exec ${DAEMON} -- ${BOPTIONS}
+      start-stop-daemon --oknodo --stop --quiet ${USERGRP} --exec ${DAEMON} -- ${BOPTIONS}
       RETVAL=$?
       echo "${NAME}"
       ;;
-   restart|force-reload)
+    restart|force-reload)
       $0 stop
       sleep 5
       $0 start
       ;;
-   *)
+    status)
+        status_of_proc -p ${PIDFILE} ${DAEMON} ${NAME} && exit 0 || exit $?
+        ;;
+    *)
       echo "Usage: /etc/init.d/${NAME} {start|stop|restart|force-reload}" >&2
       exit 1
       ;;
diff --git a/platforms/ubuntu/bareos-fd.in b/platforms/ubuntu/bareos-fd.in
index 2e57f6886c5..ef24cb660e8 100644
--- a/platforms/ubuntu/bareos-fd.in
+++ b/platforms/ubuntu/bareos-fd.in
@@ -56,6 +56,9 @@ if [ "x${BUSER}" != "x" ]; then
    fi
 fi
 
+# define LSB functions.
+. /lib/lsb/init-functions
+
 case "$1" in
    start)
       echo -n "Starting ${DESC}: "
@@ -74,6 +77,9 @@ case "$1" in
       sleep 5
       $0 start
       ;;
+    status)
+        status_of_proc -p ${PIDFILE} ${DAEMON} ${NAME} && exit 0 || exit $?
+        ;;
    *)
       echo "Usage: /etc/init.d/${NAME} {start|stop|restart|force-reload}" >&2
       exit 1
diff --git a/platforms/ubuntu/bareos-sd.in b/platforms/ubuntu/bareos-sd.in
index 30386f9c3d8..39ac7744a37 100644
--- a/platforms/ubuntu/bareos-sd.in
+++ b/platforms/ubuntu/bareos-sd.in
@@ -56,6 +56,9 @@ if [ "x${BUSER}" != "x" ]; then
    fi
 fi
 
+# define LSB functions.
+. /lib/lsb/init-functions
+
 case "$1" in
    start)
       echo -n "Starting ${DESC}: "
@@ -74,6 +77,9 @@ case "$1" in
       sleep 5
       $0 start
       ;;
+    status)
+        status_of_proc -p ${PIDFILE} ${DAEMON} ${NAME} && exit 0 || exit $?
+        ;;
    *)
       echo "Usage: /etc/init.d/${NAME} {start|stop|restart|force-reload}" >&2
       exit 1
diff --git a/scripts/bareos-config b/scripts/bareos-config
old mode 100644
new mode 100755
index 47c5a961f4a..b297cdc2a48
--- a/scripts/bareos-config
+++ b/scripts/bareos-config
@@ -197,7 +197,7 @@ replace()
 init()
 {
     initialize_local_hostname
-    initialize_director_hostname
+    #initialize_director_hostname
     initialize_passwords
     initialize_database_driver
 }
@@ -206,7 +206,7 @@ init()
 args=$#
 
 # without parameter, nothing is done.
-# this allows thsi script to be sourced
+# this allows this script to be sourced
 # to use its functions
 if [ $args -ge 1 ]; then
     # executes given arguments