diff --git a/web/php-fastcgi.yml b/web/php-fastcgi.yml
index 75a7729..4825588 100644
--- a/web/php-fastcgi.yml
+++ b/web/php-fastcgi.yml
@@ -1,8 +1,5 @@
 ---
 
-- name: Create php-fastcgi work directory
-  file: path=/var/run/php-fastcgi state=directory
-
 - name: Create init.d script for php-fastcgi
   copy: src=web/php-fastcgi/php-fastcgi
     dest=/etc/init.d/php-fastcgi mode=0751
@@ -12,4 +9,4 @@
     dest=/etc/init/php-fastcgi
 
 - name: Ensure that php-fastcgi service is enabled and running
-  service: name=php-fastcgi state=running
+  service: name=php-fastcgi state=running enabled=yes
diff --git a/web/php-fastcgi/php-fastcgi b/web/php-fastcgi/php-fastcgi
index 855e540..772417a 100644
--- a/web/php-fastcgi/php-fastcgi
+++ b/web/php-fastcgi/php-fastcgi
@@ -3,8 +3,8 @@
 FASTCGI_USER=deploy
 FASTCGI_GROUP=deploy
 ADDRESS=127.0.0.1
-PORT=9000 
-PIDFILE=/var/run/php-fastcgi/php-fastcgi.pid
+PORT=9000
+PIDFILE=/var/run/php-fastcgi.pid
 CHILDREN=6
 PHP5=/usr/bin/php5-cgi