diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 8f1f3b78ba..65c274fe0a 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -18,5 +18,11 @@ RUN echo 'memory_limit = 512M' >> /usr/local/etc/php/conf.d/local.ini
 
 ENV FORMAT=xhtml
 
-CMD php doc-base/configure.php --disable-segfault-error && \
-    php phd/render.php --docbook doc-base/.manual.xml --output=/var/www/en/output --package PHP --format ${FORMAT}
+CMD ["sh", "-c", "\
+php doc-base/configure.php && \
+exec php phd/render.php \
+  --docbook doc-base/.manual.xml \
+  --output=/var/www/en/output \
+  --package PHP \
+  --format ${FORMAT}\
+"]
diff --git a/Makefile b/Makefile
index 8464e1a10b..2b383207a2 100644
--- a/Makefile
+++ b/Makefile
@@ -27,8 +27,8 @@ php: .docker/built
 
 build: .docker/built
 
-.docker/built:
-	docker build\
-		--build-arg UID=${CURRENT_UID} --build-arg GID=${CURRENT_GID}\
+.docker/built: .docker/Dockerfile
+	docker build \
+		--build-arg UID=${CURRENT_UID} --build-arg GID=${CURRENT_GID} \
 		.docker -t php/doc-en
 	touch .docker/built