diff --git a/Dockerfile b/Dockerfile
index f4890c6..11945fd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,6 +13,12 @@ RUN curl -o /usr/local/bin/gosu -SL "https://github.com/tianon/gosu/releases/dow
 	&& rm /usr/local/bin/gosu.asc \
 	&& chmod +x /usr/local/bin/gosu
 
+# grab tini for signal processing and zombie killing
+RUN set -x \
+	&& curl -fSL "https://github.com/krallin/tini/releases/download/v0.5.0/tini" -o /usr/local/bin/tini \
+	&& chmod +x /usr/local/bin/tini \
+	&& tini -h
+
 # Add the officially endorsed Erlang debian repository:
 # See:
 #  - http://www.erlang.org/download.html
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index ea4f6a2..2aadb4d 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -57,7 +57,7 @@ if [ "$1" = 'rabbitmq-server' ]; then
 	fi
 
 	chown -R rabbitmq /var/lib/rabbitmq
-	set -- gosu rabbitmq "$@"
+	set -- gosu rabbitmq tini -- "$@"
 fi
 
 exec "$@"