diff --git a/Makefile b/Makefile
index 9c5fb55..03752ac 100644
--- a/Makefile
+++ b/Makefile
@@ -97,6 +97,8 @@ $(_BUILD_APACHE2_FRONTEND)/.compiled: $(_BUILD_APACHE2_FRONTEND)/.configured
 
 $(_BUILD_APACHE2_FRONTEND)/.installed: $(_BUILD_APACHE2_FRONTEND)/.compiled
 	make -C $(_BUILD_APACHE2_FRONTEND) install
+	rm -f /etc/apache2-fe/highperformance*
+	rm -f /etc/apache2-fe/ssl*
 	touch $@
 
 apache2-fe-clean:
@@ -128,6 +130,8 @@ $(_BUILD_APACHE2_BACKEND)/.compiled: $(_BUILD_APACHE2_BACKEND)/.configured
 
 $(_BUILD_APACHE2_BACKEND)/.installed: $(_BUILD_APACHE2_BACKEND)/.compiled
 	make -C $(_BUILD_APACHE2_BACKEND) install
+	rm -f /etc/apache2-be/highperformance*
+	rm -f /etc/apache2-be/ssl*
 	touch $@
 
 $(SOURCE_RPAF)/.compiled: $(SOURCE_RPAF)/.unpacked $(_BUILD_APACHE2_BACKEND)/.installed
@@ -142,9 +146,9 @@ $(_BUILD_APACHE2_BACKEND_PHP)/.configured: $(SOURCE_PHP4)/.unpacked $(_BUILD_APA
 	mkdir -p $(_BUILD_APACHE2_BACKEND_PHP)
 	( cd $(_BUILD_APACHE2_BACKEND_PHP); \
 	    $(SOURCE_PHP4)/configure \
-	    	--prefix=$(DESTDIR)/apache2-backend-php/ \
+	    	--prefix=$(DESTDIR)/apache2-backend-php \
 		--with-apxs2=$(DESTDIR)/apache2-backend/bin/apxs \
-		--with-config-file-path=/etc/apache2-be/
+		--with-config-file-path=/etc/apache2-be \
 		--disable-cli \
 		--disable-cgi \
 		--with-layout=GNU \
@@ -167,10 +171,10 @@ $(_BUILD_APACHE2_BACKEND_PHP)/.compiled: $(_BUILD_APACHE2_BACKEND_PHP)/.configur
 $(_BUILD_APACHE2_BACKEND_PHP)/.installed: $(_BUILD_APACHE2_BACKEND_PHP)/.compiled
 	make -C $(_BUILD_APACHE2_BACKEND_PHP) install
 	# copy default php.ini
-	cp $(_BUILD_APACHE2_BACKEND_PHP)/php.ini-dist /etc/apache2-be/php.ini
+	cp $(SOURCE_PHP4)/php.ini-dist /etc/apache2-be/php.ini
 	# set extension-dir
 	sed -i /etc/apache2-be/php.ini \
-	    -e 's:^extension_dir.*$:extension_dir = /opt/apache2-backend-php/lib/php/20020429/:'
+	    -e 's:^extension_dir.*$$:extension_dir = $(shell $(DESTDIR)/apache2-backend-php/bin/php-config --extension-dir):'
 	touch $@
 
 $(SOURCE_EACCELERATOR)/.configured:  $(SOURCE_EACCELERATOR)/.unpacked $(_BUILD_APACHE2_BACKEND_PHP)/.installed
@@ -188,7 +192,12 @@ $(SOURCE_EACCELERATOR)/.compiled:  $(SOURCE_EACCELERATOR)/.configured
 
 $(SOURCE_EACCELERATOR)/.installed:  $(SOURCE_EACCELERATOR)/.compiled
 	make -C $(SOURCE_EACCELERATOR) install
-	cp $(SOURCE_EACCELERATOR)/eaccelerator.ini /etc/apache2-be/
+	# enable eaccelerator
+	sed $(SOURCE_EACCELERATOR)/eaccelerator.ini \
+	    -e 's:^zend_extension:;zend_extension:' \
+	    -e 's:;extension="eaccelerator.so":extension="eaccelerator.so":' \
+	    -e 's:^eaccelerator.log_file.*$$:eaccelerator.log_file = "/var/log/apache2-be/eaccelerator.log":' \
+	    >> /etc/apache2-be/php.ini
 	touch $@
 
 apache2-be-clean:
diff --git a/apache2-layouts b/apache2-layouts
index 84c72a8..a7913ad 100644
--- a/apache2-layouts
+++ b/apache2-layouts
@@ -1,12 +1,12 @@
 <Layout Frontend>
-    prefix:        /opt/apache2-fe
+    prefix:        /opt/apache2-frontend
     exec_prefix:   ${prefix}
     bindir:        ${exec_prefix}/bin
     sbindir:       ${exec_prefix}/bin
     libdir:        ${exec_prefix}/lib
     libexecdir:    ${exec_prefix}/modules
     mandir:        ${prefix}/man
-    sysconfdir:    /etc/apache2-fe/
+    sysconfdir:    /etc/apache2-fe
     datadir:       ${prefix}
     installbuilddir: ${datadir}/build
     errordir:      ${datadir}/error
@@ -16,20 +16,20 @@
     cgidir:        ${datadir}/cgi-bin
     includedir:    ${prefix}/include
     localstatedir: ${prefix}
-    runtimedir:    /var/log/apache2-fe/
-    logfiledir:    /var/log/apache2-fe/
+    runtimedir:    ${localstatedir}/run
+    logfiledir:    /var/log/apache2-fe
     proxycachedir: ${localstatedir}/proxy
 </Layout>
 
 <Layout Backend>
-    prefix:        /opt/apache2-be
+    prefix:        /opt/apache2-backend
     exec_prefix:   ${prefix}
     bindir:        ${exec_prefix}/bin
     sbindir:       ${exec_prefix}/bin
     libdir:        ${exec_prefix}/lib
     libexecdir:    ${exec_prefix}/modules
     mandir:        ${prefix}/man
-    sysconfdir:    /etc/apache2-be/
+    sysconfdir:    /etc/apache2-be
     datadir:       ${prefix}
     installbuilddir: ${datadir}/build
     errordir:      ${datadir}/error
@@ -39,7 +39,7 @@
     cgidir:        ${datadir}/cgi-bin
     includedir:    ${prefix}/include
     localstatedir: ${prefix}
-    runtimedir:    /var/log/apache2-be/
-    logfiledir:    /var/log/apache2-be/
+    runtimedir:    ${localstatedir}/run
+    logfiledir:    /var/log/apache2-be
     proxycachedir: ${localstatedir}/proxy
 </Layout>