diff --git a/repos/jekyll/copy/all/usr/jekyll/bin/jekyll b/repos/jekyll/copy/all/usr/jekyll/bin/jekyll
index 4ae2ba7d1ab74346ecaa658977b50199560d31e4..2b1ed08195d4fdd92644a8d041a4cffbfc34726f 100755
--- a/repos/jekyll/copy/all/usr/jekyll/bin/jekyll
+++ b/repos/jekyll/copy/all/usr/jekyll/bin/jekyll
@@ -2,6 +2,8 @@
 [ "$DEBUG" = "true" ] && set -x
 set -e
 
+trap 'kill -SIGTERM ${!}' TERM
+
 args=$(default-args "$@")
 
 #
@@ -33,4 +35,4 @@ sup_args=""
 exe=$BUNDLE_BIN/jekyll
 [ "$JEKYLL_DOCKER_TAG" = "pages" ] && sup_args="-r github-pages"
 [ -x "$exe" ] && exec su-exec jekyll bundle exec ruby $sup_args $exe $args
-su-exec jekyll ruby $sup_args "$GEM_BIN/jekyll" $args
+su-exec jekyll ruby $sup_args "$GEM_BIN/jekyll" $args & wait ${!}