@@ -221,6 +221,7 @@ if [[ -z "${PHP_VERSION}" ]]; then
 fi
 
 cp $BP_DIR/conf/httpd.conf $APACHE_PATH/conf
+cp $BP_DIR/conf/httpd-old.conf $APACHE_PATH/conf
 cp -r $BP_DIR/conf/mods-enabled $APACHE_PATH/conf
 if [ -d .buildpack/apache/conf ]; then
   cp .buildpack/apache/conf/* $APACHE_PATH/conf/user
 
@@ -0,0 +1,48 @@
+# for documentation of the directives see http://httpd.apache.org/docs/2.2/mod/directives.html
+ErrorLog syslog
+LogLevel warn
+
+Include /etc/apache2/mods-enabled/*.load
+Include /etc/apache2/mods-enabled/*.conf
+
+ServerRoot /app/apache/
+ServerTokens Prod
+ServerName localhost
+Listen ${PORT}
+
+LockFile logs/accept.lock
+PidFile logs/httpd.pid
+
+KeepAlive Off
+
+<Files ~ "^\.ht">
+    Order allow,deny
+    Deny from all
+    Satisfy all
+</Files>
+
+<Directory />
+    Options FollowSymLinks
+    AllowOverride None
+    Order allow,deny
+    Deny from all
+</Directory>
+
+<Directory /app/php/box>
+    AllowOverride None
+    Options None
+    Order Deny,Allow
+    Allow from All
+    Header always unset Content-Length
+</Directory>
+
+SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1
+
+FastCGIExternalServer /app/php/box/php-fpm -socket /app/fcgi_sock -idle-timeout 120 -pass-header Authorization
+AddHandler php-fpm .php
+Action php-fpm /box
+Alias /box /app/php/box/php-fpm
+
+Include conf/share/*.conf
+Include conf/local/*.conf
+Include conf/user/*.conf
@@ -49,8 +49,8 @@ fi
 # FIXME detect abnormal php-fpm exit
 php5-fpm --fpm-config /app/php/php-fpm.ini &
 phppid=$!
-#apache2 -f /app/apache/conf/httpd.conf -D FOREGROUND &
-/srv/www/httpd-2.2.31/bin/apachectl -f /app/apache/conf/httpd.conf -D FOREGROUND &
+apache2 -f /app/apache/conf/httpd-old.conf -D FOREGROUND &
+#/srv/www/httpd-2.2.31/bin/apachectl -f /app/apache/conf/httpd.conf -D FOREGROUND &
 apachepid=$!
 wait $apachepid