--- httpd-2.4.3/docs/conf/httpd.conf.in	2012-08-14 20:53:31.000000000 +0000
+++ httpd-2.4.3-magellan/docs/conf/httpd.conf.in	2012-10-31 12:53:29.385930129 +0000
@@ -355,48 +355,46 @@
 
 # Supplemental configuration
 #
-# The configuration files in the @rel_sysconfdir@/extra/ directory can be 
+# The configuration files in the @rel_sysconfdir@/modules.d/ directory can be 
 # included to add extra features or to modify the default configuration of 
 # the server, or you may simply copy their contents here and change as 
 # necessary.
 
 # Server-pool management (MPM specific)
-#Include @rel_sysconfdir@/extra/httpd-mpm.conf
+Include @rel_sysconfdir@/modules.d/mpm.conf
 
 # Multi-language error messages
-#Include @rel_sysconfdir@/extra/httpd-multilang-errordoc.conf
+#Include @rel_sysconfdir@/modules.d/multilang-errordoc.conf
 
 # Fancy directory listings
-#Include @rel_sysconfdir@/extra/httpd-autoindex.conf
+#Include @rel_sysconfdir@/modules.d/autoindex.conf
 
 # Language settings
-#Include @rel_sysconfdir@/extra/httpd-languages.conf
+#Include @rel_sysconfdir@/modules.d/languages.conf
 
 # User home directories
-#Include @rel_sysconfdir@/extra/httpd-userdir.conf
+#Include @rel_sysconfdir@/modules.d/userdir.conf
 
 # Real-time info on requests and configuration
-#Include @rel_sysconfdir@/extra/httpd-info.conf
+#Include @rel_sysconfdir@/modules.d/info.conf
 
 # Virtual hosts
-#Include @rel_sysconfdir@/extra/httpd-vhosts.conf
+#Include @rel_sysconfdir@/modules.d/vhosts.conf
 
 # Local access to the Apache HTTP Server Manual
-#Include @rel_sysconfdir@/extra/httpd-manual.conf
+#Include @rel_sysconfdir@/modules.d/manual.conf
 
 # Distributed authoring and versioning (WebDAV)
-#Include @rel_sysconfdir@/extra/httpd-dav.conf
+#Include @rel_sysconfdir@/modules.d/dav.conf
 
 # Various default settings
-#Include @rel_sysconfdir@/extra/httpd-default.conf
+Include @rel_sysconfdir@/modules.d/default.conf
 
 # Configure mod_proxy_html to understand HTML4/XHTML1
-<IfModule proxy_html_module>
-Include @rel_sysconfdir@/extra/proxy-html.conf
-</IfModule>
+#Include @rel_sysconfdir@/modules.d/proxy-html.conf
 
 # Secure (SSL/TLS) connections
-#Include @rel_sysconfdir@/extra/httpd-ssl.conf
+#Include @rel_sysconfdir@/modules.d/ssl.conf
 #
 # Note: The following must must be present to support
 #       starting without SSL on platforms with no /dev/random equivalent