diff --git a/per-user/lamp-git/init/generic.sh b/per-user/lamp-git/init/generic.sh
new file mode 100755
index 0000000000000000000000000000000000000000..97a7ba5f0ed57c4999bd877f2822ae8f5134cc33
--- /dev/null
+++ b/per-user/lamp-git/init/generic.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+mkdir -p /data/uploads
+mkdir -p /data/www-content
+touch /data/www-content/.htaccess
+touch /data/dump.sql
+
+chown -R root:www-data /data
+chmod -R 770 /data/uploads
+chmod -R 750 /data/www-content
+
+cd /data
+git init
+git config --local user.email "backup@IndieHosters"
+git config --local user.name "IndieHosters backup"
diff --git a/per-user/lamp-git/init/wordpress.sh b/per-user/lamp-git/init/wordpress.sh
old mode 100644
new mode 100755
index fbd1d448b5675c3b2883a1260de401eb75c3df3b..370dc8ea240fd1c5c41b6dbdccc6348d44e094bb
--- a/per-user/lamp-git/init/wordpress.sh
+++ b/per-user/lamp-git/init/wordpress.sh
@@ -2,11 +2,16 @@ if  [ $# -lt 4 ]; then
   echo Usage: ./wordpress.sh https://exampledomain.com/ "Example Domain" "example" "example@elsewhere.com"
   exit 1
 fi
+
 echo Unpacking latest WordPress into /data/www-content...
 curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar
 php /root/wp-cli.phar --path="/data/www-content" --allow-root core download
 php /root/wp-cli.phar --path="/data/www-content" --allow-root core config --dbname=wordpress --dbuser=root
 php /root/wp-cli.phar --path="/data/www-content" --allow-root db create
+
+# pwgen is not part of the runtime lamp-git image:
+apt-get update
+apt-get install -y pwgen
 PWD=`pwgen 40 1`
 php /root/wp-cli.phar --path="/data/www-content" --allow-root core install \
 	--url="$1" --title="$2" --admin_user="$3" --admin_password="$PWD" --admin_email="$4"
@@ -51,6 +56,10 @@ php /root/wp-cli.phar --path="/data/www-content" --allow-root plugin activate in
 php /root/wp-cli.phar --path="/data/www-content" --allow-root theme install sempress
 php /root/wp-cli.phar --path="/data/www-content" --allow-root theme activate sempress
 
+echo Making  WordPress content folder writable for the webserver...
+chown -R root:www-data /data/www-content
+chmod 770 /data/www-content/wp-content
+
 echo "user: $3" > /data/login.txt
 echo "pass: $PWD" >> /data/login.txt
 echo "Done, login details saved to /data/login.txt"
diff --git a/per-user/lamp-git/run.sh b/per-user/lamp-git/run.sh
old mode 100644
new mode 100755
index 2d73b124bee6409060b558206e74227b415b1505..dc46b5d6817f46fe9c5397fb9cec22ca6690b48f
--- a/per-user/lamp-git/run.sh
+++ b/per-user/lamp-git/run.sh
@@ -11,22 +11,11 @@ do
     sleep 1
 done
 
-mkdir -p /data/uploads
-mkdir -p /data/www-content
-touch /data/dump.sql
-
-chown -R root:www-data /data
-chmod -R 770 /data/uploads
-chmod -R 750 /data/www-content
-
 mysql < /data/dump.sql
 source /etc/apache2/envvars
 exec apache2 &
 
 cd /data
-git init
-git config --local user.email "backup@IndieHosters"
-git config --local user.name "IndieHosters backup"
 
 while true; do
   mysqldump --all-databases > dump.sql