diff -Naur httpd-2.4.1/docs/conf/extra/httpd-autoindex.conf.in httpd-2.4.1.oden/docs/conf/extra/httpd-autoindex.conf.in
--- httpd-2.4.1/docs/conf/extra/httpd-autoindex.conf.in	2010-06-15 13:05:13.000000000 +0200
+++ httpd-2.4.1.oden/docs/conf/extra/httpd-autoindex.conf.in	2012-03-07 13:10:17.136751204 +0100
@@ -14,6 +14,7 @@
 # listings.
 #
 IndexOptions FancyIndexing HTMLTable VersionSort
+IndexOptions +IconWidth=16 +IconHeight=16 +NameWidth=*
 
 # We include the /icons/ alias for FancyIndexed directory listings.  If
 # you do not use FancyIndexing, you may comment this out.
@@ -54,6 +55,7 @@
 AddIcon /icons/script.gif .conf .sh .shar .csh .ksh .tcl
 AddIcon /icons/tex.gif .tex
 AddIcon /icons/bomb.gif core
+AddIcon /icons/rpm.png .rpm
 
 AddIcon /icons/back.gif ..
 AddIcon /icons/hand.right.gif README
diff -Naur httpd-2.4.1/docs/conf/extra/httpd-dav.conf.in httpd-2.4.1.oden/docs/conf/extra/httpd-dav.conf.in
--- httpd-2.4.1/docs/conf/extra/httpd-dav.conf.in	2011-06-13 23:13:08.000000000 +0200
+++ httpd-2.4.1.oden/docs/conf/extra/httpd-dav.conf.in	2012-03-07 13:06:39.835739053 +0100
@@ -12,11 +12,11 @@
 # on the directory where the DavLockDB is placed and on any directory where
 # "Dav On" is specified.
 
-DavLockDB "@@ServerRoot@@/var/DavLock"
+DavLockDB "/var/lib/dav"
 
-Alias /uploads "@@ServerRoot@@/uploads"
+Alias /uploads "/var/lib/dav/uploads"
 
-<Directory "@@ServerRoot@@/uploads">
+<Directory "/var/lib/dav/uploads">
     Dav On
 
     AuthType Digest
diff -Naur httpd-2.4.1/docs/conf/extra/httpd-default.conf.in httpd-2.4.1.oden/docs/conf/extra/httpd-default.conf.in
--- httpd-2.4.1/docs/conf/extra/httpd-default.conf.in	2011-11-08 21:41:47.000000000 +0100
+++ httpd-2.4.1.oden/docs/conf/extra/httpd-default.conf.in	2012-03-07 13:11:30.726755318 +0100
@@ -62,7 +62,7 @@
 # Set to "EMail" to also include a mailto: link to the ServerAdmin.
 # Set to one of:  On | Off | EMail
 #
-ServerSignature Off
+ServerSignature On
 
 #
 # HostnameLookups: Log the names of clients or just their IP addresses
diff -Naur httpd-2.4.1/docs/conf/extra/httpd-info.conf.in httpd-2.4.1.oden/docs/conf/extra/httpd-info.conf.in
--- httpd-2.4.1/docs/conf/extra/httpd-info.conf.in	2010-06-15 13:05:13.000000000 +0200
+++ httpd-2.4.1.oden/docs/conf/extra/httpd-info.conf.in	2012-03-07 13:06:39.875739054 +0100
@@ -13,7 +13,6 @@
 
 <Location /server-status>
     SetHandler server-status
-    Require host .example.com
     Require ip 127
 </Location>
 
@@ -22,7 +21,7 @@
 # information (ExtendedStatus On) or just basic information (ExtendedStatus
 # Off) when the "server-status" handler is called. The default is Off.
 #
-#ExtendedStatus On
+ExtendedStatus On
 
 #
 # Allow remote server configuration reports, with the URL of
@@ -31,6 +30,5 @@
 #
 <Location /server-info>
     SetHandler server-info
-    Require host .example.com
     Require ip 127
 </Location>
diff -Naur httpd-2.4.1/docs/conf/extra/httpd-mpm.conf.in httpd-2.4.1.oden/docs/conf/extra/httpd-mpm.conf.in
--- httpd-2.4.1/docs/conf/extra/httpd-mpm.conf.in	2011-11-12 08:15:45.000000000 +0100
+++ httpd-2.4.1.oden/docs/conf/extra/httpd-mpm.conf.in	2012-03-07 13:06:39.904739056 +0100
@@ -8,9 +8,7 @@
 #
 # Note that this is the default PidFile for most MPMs.
 #
-<IfModule !mpm_netware_module>
-    PidFile "@rel_runtimedir@/httpd.pid"
-</IfModule>
+PidFile "@rel_runtimedir@/httpd.pid"
 
 #
 # Only one of the below sections will be relevant on your
@@ -67,53 +65,8 @@
     MaxConnectionsPerChild   0
 </IfModule>
 
-# NetWare MPM
-# ThreadStackSize: Stack size allocated for each worker thread
-# StartThreads: Number of worker threads launched at server startup
-# MinSpareThreads: Minimum number of idle threads, to handle request spikes
-# MaxSpareThreads: Maximum number of idle threads
-# MaxThreads: Maximum number of worker threads alive at the same time
-# MaxConnectionsPerChild: Maximum  number of connections a thread serves. It
-#                         is recommended that the default value of 0 be set
-#                         for this directive on NetWare.  This will allow the
-#                         thread to continue to service requests indefinitely.
-<IfModule mpm_netware_module>
-    ThreadStackSize      65536
-    StartThreads           250
-    MinSpareThreads         25
-    MaxSpareThreads        250
-    MaxThreads            1000
-    MaxConnectionsPerChild   0
-</IfModule>
-
-# OS/2 MPM
-# StartServers: Number of server processes to maintain
-# MinSpareThreads: Minimum number of idle threads per process, 
-#                  to handle request spikes
-# MaxSpareThreads: Maximum number of idle threads per process
-# MaxConnectionsPerChild: Maximum number of connections per server process
-<IfModule mpm_mpmt_os2_module>
-    StartServers             2
-    MinSpareThreads          5
-    MaxSpareThreads         10
-    MaxConnectionsPerChild   0
-</IfModule>
-
-# WinNT MPM
-# ThreadsPerChild: constant number of worker threads in the server process
-# MaxConnectionsPerChild: maximum number of connections a server process serves
-<IfModule mpm_winnt_module>
-    ThreadsPerChild        150
-    MaxConnectionsPerChild   0
-</IfModule>
-
 # The maximum number of free Kbytes that every allocator is allowed
 # to hold without calling free(). In threaded MPMs, every thread has its own
 # allocator. When not set, or when set to zero, the threshold will be set to
 # unlimited.
-<IfModule !mpm_netware_module>
-    MaxMemFree            2048
-</IfModule>
-<IfModule mpm_netware_module>
-    MaxMemFree             100
-</IfModule>
+MaxMemFree            2048
diff -Naur httpd-2.4.1/docs/conf/extra/httpd-ssl.conf.in httpd-2.4.1.oden/docs/conf/extra/httpd-ssl.conf.in
--- httpd-2.4.1/docs/conf/extra/httpd-ssl.conf.in	2011-11-18 18:18:31.000000000 +0100
+++ httpd-2.4.1.oden/docs/conf/extra/httpd-ssl.conf.in	2012-03-07 13:06:39.904739056 +0100
@@ -1,3 +1,4 @@
+<IfModule ssl_module>
 #
 # This is the Apache server configuration file providing SSL support.
 # It contains the configuration directives to instruct the server how to
@@ -73,7 +74,7 @@
 #   Configure the SSL Session Cache: First the mechanism 
 #   to use and second the expiring timeout (in seconds).
 #SSLSessionCache         "dbm:@exp_runtimedir@/ssl_scache"
-SSLSessionCache        "shmcb:@exp_runtimedir@/ssl_scache(512000)"
+SSLSessionCache        "shmcb:/var/cache/httpd/mod_ssl/ssl_scache(512000)"
 SSLSessionCacheTimeout  300
 
 ##
@@ -84,10 +85,10 @@
 
 #   General setup for the virtual host
 DocumentRoot "@exp_htdocsdir@"
-ServerName www.example.com:@@SSLPort@@
-ServerAdmin you@example.com
-ErrorLog "@exp_logfiledir@/error_log"
-TransferLog "@exp_logfiledir@/access_log"
+ServerName localhost:@@SSLPort@@
+ServerAdmin root@localhost
+ErrorLog "@exp_logfiledir@/ssl_error_log"
+TransferLog "@exp_logfiledir@/ssl_access_log"
 
 #   SSL Engine Switch:
 #   Enable/Disable SSL for this virtual host.
@@ -103,9 +104,9 @@
 #   Some ECC cipher suites (http://www.ietf.org/rfc/rfc4492.txt)
 #   require an ECC certificate which can also be configured in
 #   parallel.
-SSLCertificateFile "@exp_sysconfdir@/server.crt"
-#SSLCertificateFile "@exp_sysconfdir@/server-dsa.crt"
-#SSLCertificateFile "@exp_sysconfdir@/server-ecc.crt"
+SSLCertificateFile /etc/pki/tls/certs/localhost.crt
+#SSLCertificateFile /etc/pki/tls/certs/server-dsa.crt
+#SSLCertificateFile /etc/pki/tls/certs/server-ecc.crt
 
 #   Server Private Key:
 #   If the key is not combined with the certificate, use this
@@ -113,9 +114,9 @@
 #   you've both a RSA and a DSA private key you can configure
 #   both in parallel (to also allow the use of DSA ciphers, etc.)
 #   ECC keys, when in use, can also be configured in parallel
-SSLCertificateKeyFile "@exp_sysconfdir@/server.key"
-#SSLCertificateKeyFile "@exp_sysconfdir@/server-dsa.key"
-#SSLCertificateKeyFile "@exp_sysconfdir@/server-ecc.key"
+SSLCertificateKeyFile /etc/pki/tls/private/localhost.key
+#SSLCertificateKeyFile /etc/pki/tls/private/server-dsa.key
+#SSLCertificateKeyFile /etc/pki/tls/private/server-ecc.key
 
 #   Server Certificate Chain:
 #   Point SSLCertificateChainFile at a file containing the
@@ -124,7 +125,7 @@
 #   the referenced file can be the same as SSLCertificateFile
 #   when the CA certificates are directly appended to the server
 #   certificate for convenience.
-#SSLCertificateChainFile "@exp_sysconfdir@/server-ca.crt"
+#SSLCertificateChainFile /etc/pki/tls/certs/server-chain.crt
 
 #   Certificate Authority (CA):
 #   Set the CA certificate verification path where to find CA
@@ -133,8 +134,8 @@
 #   Note: Inside SSLCACertificatePath you need hash symlinks
 #         to point to the certificate files. Use the provided
 #         Makefile to update the hash symlinks after changes.
-#SSLCACertificatePath "@exp_sysconfdir@/ssl.crt"
-#SSLCACertificateFile "@exp_sysconfdir@/ssl.crt/ca-bundle.crt"
+#SSLCACertificatePath /etc/pki/tls/certs
+#SSLCACertificateFile /etc/pki/tls/certs/ca-bundle.crt
 
 #   Certificate Revocation Lists (CRL):
 #   Set the CA revocation path where to find CA CRLs for client
@@ -145,8 +146,8 @@
 #   Note: Inside SSLCARevocationPath you need hash symlinks
 #         to point to the certificate files. Use the provided
 #         Makefile to update the hash symlinks after changes.
-#SSLCARevocationPath "@exp_sysconfdir@/ssl.crl"
-#SSLCARevocationFile "@exp_sysconfdir@/ssl.crl/ca-bundle.crl"
+#SSLCARevocationPath /etc/pki/tls/certs/ssl.crl
+#SSLCARevocationFile /etc/pki/tls/certs/ca-bundle.crl
 #SSLCARevocationCheck chain
 
 #   Client Authentication (Type):
@@ -241,4 +242,8 @@
 CustomLog "@exp_logfiledir@/ssl_request_log" \
           "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
 
-</VirtualHost>                                  
+RewriteEngine On
+RewriteOptions inherit
+
+</VirtualHost>
+</IfModule>
diff -Naur httpd-2.4.1/docs/conf/extra/httpd-userdir.conf.in httpd-2.4.1.oden/docs/conf/extra/httpd-userdir.conf.in
--- httpd-2.4.1/docs/conf/extra/httpd-userdir.conf.in	2011-06-06 23:40:41.000000000 +0200
+++ httpd-2.4.1.oden/docs/conf/extra/httpd-userdir.conf.in	2012-03-07 13:06:39.905739056 +0100
@@ -1,3 +1,5 @@
+<IfModule userdir_module>
+
 # Settings for user home directories
 #
 # Required module: mod_authz_core, mod_authz_host, mod_userdir
@@ -19,3 +21,4 @@
     Require method GET POST OPTIONS
 </Directory>
 
+</IfModule>
diff -Naur httpd-2.4.1/docs/conf/extra/httpd-vhosts.conf.in httpd-2.4.1.oden/docs/conf/extra/httpd-vhosts.conf.in
--- httpd-2.4.1/docs/conf/extra/httpd-vhosts.conf.in	2011-01-14 17:09:18.000000000 +0100
+++ httpd-2.4.1.oden/docs/conf/extra/httpd-vhosts.conf.in	2012-03-07 13:06:39.905739056 +0100
@@ -20,22 +20,21 @@
 # The first VirtualHost section is used for all requests that do not
 # match a ServerName or ServerAlias in any <VirtualHost> block.
 #
-<VirtualHost *:@@Port@@>
-    ServerAdmin webmaster@dummy-host.example.com
-    DocumentRoot "@@ServerRoot@@/docs/dummy-host.example.com"
-    ServerName dummy-host.example.com
-    ServerAlias www.dummy-host.example.com
-    ErrorLog "@rel_logfiledir@/dummy-host.example.com-error_log"
-    CustomLog "@rel_logfiledir@/dummy-host.example.com-access_log" common
-</VirtualHost>
-
-<VirtualHost *:@@Port@@>
-    ServerAdmin webmaster@dummy-host2.example.com
-    DocumentRoot "@@ServerRoot@@/docs/dummy-host2.example.com"
-    ServerName dummy-host2.example.com
-    ErrorLog "@rel_logfiledir@/dummy-host2.example.com-error_log"
-    CustomLog "@rel_logfiledir@/dummy-host2.example.com-access_log" common
-</VirtualHost>
-
+#<VirtualHost *:@@Port@@>
+#    ServerAdmin webmaster@dummy-host.example.com
+#    DocumentRoot "@@ServerRoot@@/docs/dummy-host.example.com"
+#    ServerName dummy-host.example.com
+#    ServerAlias www.dummy-host.example.com
+#    ErrorLog "@rel_logfiledir@/dummy-host.example.com-error_log"
+#    CustomLog "@rel_logfiledir@/dummy-host.example.com-access_log" common
+#</VirtualHost>
+#
+#<VirtualHost *:@@Port@@>
+#    ServerAdmin webmaster@dummy-host2.example.com
+#    DocumentRoot "@@ServerRoot@@/docs/dummy-host2.example.com"
+#    ServerName dummy-host2.example.com
+#    ErrorLog "@rel_logfiledir@/dummy-host2.example.com-error_log"
+#    CustomLog "@rel_logfiledir@/dummy-host2.example.com-access_log" common
+#</VirtualHost>
 
 
diff -Naur httpd-2.4.1/docs/conf/httpd.conf.in httpd-2.4.1.oden/docs/conf/httpd.conf.in
--- httpd-2.4.1/docs/conf/httpd.conf.in	2012-02-06 17:55:22.000000000 +0100
+++ httpd-2.4.1.oden/docs/conf/httpd.conf.in	2012-03-07 13:09:19.210747964 +0100
@@ -63,7 +63,8 @@
 # Example:
 # LoadModule foo_module modules/mod_foo.so
 #
-@@LoadModule@@
+
+Include /etc/httpd/modules.d/*.conf
 
 <IfModule unixd_module>
 #
@@ -74,8 +75,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 apache
+Group apache
 
 </IfModule>
 
@@ -96,7 +97,7 @@
 # e-mailed.  This address appears on some server-generated pages, such
 # as error documents.  e.g. admin@your-domain.com
 #
-ServerAdmin you@example.com
+ServerAdmin root@localhost
 
 #
 # ServerName gives the name and port that the server uses to identify itself.
@@ -145,6 +146,10 @@
     #
     Options Indexes FollowSymLinks
 
+    <IfModule include_module>
+	Options +Includes
+    </IfModule>
+
     #
     # AllowOverride controls what directives may be placed in .htaccess files.
     # It can be "All", "None", or any combination of the keywords:
@@ -166,6 +171,10 @@
     DirectoryIndex index.html
 </IfModule>
 
+<IfModule include_module>
+    DirectoryIndex index.shtml
+</IfModule>
+
 #
 # The following lines prevent .htaccess and .htpasswd files from being 
 # viewed by Web clients. 
@@ -312,8 +321,11 @@
     # To parse .shtml files for server-side includes (SSI):
     # (You will also need to add "Includes" to the "Options" directive.)
     #
-    #AddType text/html .shtml
-    #AddOutputFilter INCLUDES .shtml
+    <IfModule include_module>
+	AddType text/html .shtml
+	AddOutputFilter INCLUDES .shtml
+    </IfModule>
+
 </IfModule>
 
 #
@@ -361,34 +373,34 @@
 # necessary.
 
 # Server-pool management (MPM specific)
-#Include @rel_sysconfdir@/extra/httpd-mpm.conf
+Include @rel_sysconfdir@/extra/httpd-mpm.conf
 
 # Multi-language error messages
-#Include @rel_sysconfdir@/extra/httpd-multilang-errordoc.conf
+Include @rel_sysconfdir@/extra/httpd-multilang-errordoc.conf
 
 # Fancy directory listings
-#Include @rel_sysconfdir@/extra/httpd-autoindex.conf
+Include @rel_sysconfdir@/extra/httpd-autoindex.conf
 
 # Language settings
-#Include @rel_sysconfdir@/extra/httpd-languages.conf
+Include @rel_sysconfdir@/extra/httpd-languages.conf
 
 # User home directories
-#Include @rel_sysconfdir@/extra/httpd-userdir.conf
+Include @rel_sysconfdir@/extra/httpd-userdir.conf
 
 # Real-time info on requests and configuration
-#Include @rel_sysconfdir@/extra/httpd-info.conf
+Include @rel_sysconfdir@/extra/httpd-info.conf
 
 # Virtual hosts
-#Include @rel_sysconfdir@/extra/httpd-vhosts.conf
+Include @rel_sysconfdir@/extra/httpd-vhosts.conf
 
 # Local access to the Apache HTTP Server Manual
-#Include @rel_sysconfdir@/extra/httpd-manual.conf
+Include @rel_sysconfdir@/extra/httpd-manual.conf
 
 # Distributed authoring and versioning (WebDAV)
 #Include @rel_sysconfdir@/extra/httpd-dav.conf
 
 # Various default settings
-#Include @rel_sysconfdir@/extra/httpd-default.conf
+Include @rel_sysconfdir@/extra/httpd-default.conf
 
 # Configure mod_proxy_html to understand HTML4/XHTML1
 <IfModule proxy_html_module>
@@ -396,7 +408,7 @@
 </IfModule>
 
 # Secure (SSL/TLS) connections
-#Include @rel_sysconfdir@/extra/httpd-ssl.conf
+Include @rel_sysconfdir@/extra/httpd-ssl.conf
 #
 # Note: The following must must be present to support
 #       starting without SSL on platforms with no /dev/random equivalent
@@ -406,3 +418,17 @@
 SSLRandomSeed startup builtin
 SSLRandomSeed connect builtin
 </IfModule>
+
+# include legacy Mandriva directives
+
+Include conf/fileprotector.conf
+
+# webapps configuration section
+# Web applications should be activated _after_ apache has been
+# configured properly.
+IncludeOptional conf/webapps.d/*.conf
+
+################################################################################
+# virtual hosts configuration section
+# Include virtual hosts, if any
+IncludeOptional conf/vhosts.d/*.conf