diff --git a/templates/httpd-vhost.conf.mustache b/templates/httpd-vhost.conf.mustache
index 96bac09..b2bd292 100644
--- a/templates/httpd-vhost.conf.mustache
+++ b/templates/httpd-vhost.conf.mustache
@@ -3,12 +3,16 @@
 #
 <Directory {{vars.apache_vhost.site.doc_root}}>
 	AllowOverride all
-	Options Indexes FollowSymLinks
+	Options {{ vars.apache_vhost.site.doc_root_options }} 
 	Require all granted
+	{{#vars.apache_vhost.site.php}}
 	<FilesMatch ".+(\.php)$">
-		SetHandler application/x-httpd-php
+		SetHandler {{vars.apache_vhost.site.php_handler}}
 	</FilesMatch>
+	{{/vars.apache_vhost.site.php}}
+
 	DirectoryIndex index.php index.html
+	{{{vars.apache_vhost.site.dir_raw}}}
 </Directory>
 
 {{^vars.apache_vhost.site.ssl}}