diff --git a/browsermob-dist/src/main/scripts/browsermob-proxy b/browsermob-dist/src/main/scripts/browsermob-proxy
index dc8f66897..3ba455a1e 100755
--- a/browsermob-dist/src/main/scripts/browsermob-proxy
+++ b/browsermob-dist/src/main/scripts/browsermob-proxy
@@ -9,11 +9,18 @@ then
     JAVACMD="java"
 fi
 
+# start process in the background and handle SIGTERM/SIGINT
+# see https://veithen.io/2014/11/16/sigterm-propagation.html
+trap 'kill -TERM $PID' TERM INT
 "$JAVACMD" $JAVA_OPTS \
            -Dapp.name="browsermob-proxy" \
            -Dbasedir="$BASEDIR" \
            -jar "$BASEDIR/lib/browsermob-dist-${project.version}.jar" \
-           "$@"
+           "$@" &
+PID=$!
+wait $PID
+trap - TERM INT
+wait $PID
 
 # if we couldn't find java, print a helpful error message
 if [ $? -eq 127 ]