diff --git a/CHANGELOG.md b/CHANGELOG.md
index 86250c82..283f2e3f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@ In Development
 
 System:
 
-* Install PHP7 via a PPA.
+* Install PHP7 via a PPA. Switch to the on-demand process manager.
 
 Mail:
 
diff --git a/setup/web.sh b/setup/web.sh
index 0d94fcfd..021a9b7f 100755
--- a/setup/web.sh
+++ b/setup/web.sh
@@ -51,6 +51,10 @@ tools/editconf.py /etc/php/7.0/fpm/php.ini -c ';' \
 tools/editconf.py /etc/php/7.0/fpm/php.ini -c ';' \
         default_charset="UTF-8"
 
+# Switch from the dynamic process manager to the ondemand manager see #1216
+tools/editconf.py /etc/php/7.0/fpm/pool.d/www.conf -c ';' \
+	pm=ondemand
+
 # Bump up PHP's max_children to support more concurrent connections
 tools/editconf.py /etc/php/7.0/fpm/pool.d/www.conf -c ';' \
 	pm.max_children=8