diff --git a/Dockerfile b/Dockerfile
index db843a1..160ba52 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,13 @@
 FROM haproxy:latest
 MAINTAINER RafPe
 
-RUN apt-get update && apt-get install rsyslog -y && \
+RUN apt-get update && apt-get install rsyslog wget -y && \
     sed -i 's/#$ModLoad imudp/$ModLoad imudp/g' /etc/rsyslog.conf && \
     sed -i 's/#$UDPServerRun 514/$UDPServerRun 514/g' /etc/rsyslog.conf
 
+RUN wget -O /usr/local/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_amd64
+RUN chmod +x /usr/local/bin/dumb-init
+
 ADD haproxy.conf /etc/rsyslog.d
 COPY docker-entrypoint.sh /
 
@@ -19,4 +22,5 @@ LABEL org.label-schema.build-date="2016-06-20T10:23:04Z" \
 
 EXPOSE 80 443
 
-ENTRYPOINT ["/docker-entrypoint.sh"]
+ENTRYPOINT ["/usr/local/bin/dumb-init"]
+CMD ["/docker-entrypoint.sh"]
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 8b12d76..7ba9b18 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -1,13 +1,18 @@
 #!/bin/sh
 
-# Make sure service is running
-service rsyslog start
+set -e
 
-# Touch the log file so we can tail on it
+#Make the log file & change log file permission
 touch /var/log/haproxy.log
+chmod 644 /var/log/haproxy.log
+
+# Make sure service is running
+service rsyslog start
 
 # Throw the log to output
 tail -f /var/log/haproxy.log &
 
 # Start haproxy
-exec haproxy -f /usr/local/etc/haproxy/haproxy.cfg
+exec haproxy -f /usr/local/etc/haproxy/haproxy.cfg  -p /var/run/haproxy.pid 
+
+