--- docs/conf/httpd.conf.in.orig	2007-12-21 12:43:00.000000000 +0100
+++ docs/conf/httpd.conf.in	2008-01-19 21:36:47.000000000 +0100
@@ -63,8 +63,8 @@
 # It is usually good practice to create a dedicated user and group for
 # running httpd, as with most system services.
 #
-User daemon
-Group daemon
+User %%WWWOWN%%
+Group %%WWWGRP%%
 
 </IfModule>
 </IfModule>
@@ -113,7 +113,6 @@
 # features.  
 #
 <Directory />
-    Options FollowSymLinks
     AllowOverride None
     Order deny,allow
     Deny from all
@@ -184,7 +183,7 @@
 # logged here.  If you *do* define an error logfile for a <VirtualHost>
 # container, that host's errors will be logged there and not here.
 #
-ErrorLog "@rel_logfiledir@/error_log"
+ErrorLog "@rel_logfiledir@/httpd-error.log"
 
 #
 # LogLevel: Control the number of messages logged to the error_log.
@@ -213,13 +212,13 @@
     # define per-<VirtualHost> access logfiles, transactions will be
     # logged therein and *not* in this file.
     #
-    CustomLog "@rel_logfiledir@/access_log" common
+    #CustomLog "@rel_logfiledir@/httpd-access.log" common
 
     #
     # If you prefer a logfile with access, agent, and referer information
     # (Combined Logfile Format) you can use the following directive.
     #
-    #CustomLog "@rel_logfiledir@/access_log" combined
+    CustomLog "@rel_logfiledir@/httpd-access.log" combined
 </IfModule>
 
 <IfModule alias_module>
@@ -408,3 +407,5 @@
 SSLRandomSeed startup builtin
 SSLRandomSeed connect builtin
 </IfModule>
+
+Include @rel_sysconfdir@/Includes/*.conf