diff --git a/config/nginx/nginx.conf b/config/nginx/nginx.conf
index 80c13b77..b1645191 100644
--- a/config/nginx/nginx.conf
+++ b/config/nginx/nginx.conf
@@ -1,17 +1,17 @@
 user www-data;
 worker_processes  1;
 
-error_log /var/log/nginx/error.log info;
-pid        /var/run/nginx.pid;
+error_log /data/logs/nginx-error.log info;
+pid /var/run/nginx.pid;
 
 events {
     worker_connections  1024;
 }
 
 http {
-    include       /etc/nginx/mime.types;
-    default_type  application/octet-stream;
-    access_log /var/log/nginx/access.log;
+    include /etc/nginx/mime.types;
+    default_type application/octet-stream;
+    access_log /data/logs/nginx.log;
     sendfile on;
     keepalive_timeout  65;
     server_tokens off;
diff --git a/config/rsyslog.conf b/config/rsyslog.conf
new file mode 100644
index 00000000..489b97f2
--- /dev/null
+++ b/config/rsyslog.conf
@@ -0,0 +1,5 @@
+$ModLoad imuxsock
+$ModLoad imklog
+
+
+*.* /data/logs/mail.log
diff --git a/config/supervisor/supervisord.conf b/config/supervisor/supervisord.conf
index 489b6dd6..36133ee6 100644
--- a/config/supervisor/supervisord.conf
+++ b/config/supervisor/supervisord.conf
@@ -1,6 +1,12 @@
 [supervisord]
 nodaemon = true
-logfile = /var/log/supervisor/supervisord.log
+logfile = /data/logs/supervisord.log
+
+[program:nginx]
+command = nginx -g 'daemon off;'
+
+[program:rsyslog]
+command = rsyslogd -n
 
 [program:postfix]
 command = /usr/lib/postfix/master -d
@@ -11,14 +17,12 @@ command = /usr/sbin/dovecot -c /etc/dovecot/dovecot.conf -F
 [program:spamassassin]
 command = /usr/sbin/spamd
 
-[program:rsyslog]
-command = rsyslogd -n
-
 [program:admin]
 command = uwsgi --yaml /etc/uwsgi/apps-enabled/freeposte.yml
-
-[program:nginx]
-command = nginx -g 'daemon off;'
+stdout_logfile = /data/logs/admin.log
+stderr_logfile = /data/logs/admin-error.log
 
 [program:webmail]
 command = php5-fpm -F
+stdout_logfile = /data/logs/php.log
+stderr_logfile = /data/logs/php-error.log