diff --git a/build/deb/apache.conf b/build/deb/apache.conf
index 568dd605dca..cfedcbc4dbb 100644
--- a/build/deb/apache.conf
+++ b/build/deb/apache.conf
@@ -14,7 +14,9 @@ Alias /dolibarr /usr/share/dolibarr/htdocs
 # </VirtualHost>
 
 # Directory for web pages
-<Directory /usr/share/dolibarr/htdocs>
+<DirectoryMatch /usr/share/dolibarr>
+  Order deny,allow
+  Allow from all
   DirectoryIndex index.php
   Options +FollowSymLinks +Indexes
 
@@ -54,23 +56,23 @@ Alias /dolibarr /usr/share/dolibarr/htdocs
     #ExpiresByType application/x-javascript A2592000
     #ExpiresByType application/javascript A2592000
 
-</Directory>
+</DirectoryMatch>
 
 # Directory for public pages
-<Directory /usr/share/dolibarr/htdocs/public/>
+<DirectoryMatch /usr/share/dolibarr/htdocs/public>
     AllowOverride All
     Order deny,allow
     Allow from all
-</Directory>
+</DirectoryMatch>
 
 # Directory for data files
-<Directory /usr/share/dolibarr/documents>
+<DirectoryMatch /usr/share/dolibarr/documents>
     AllowOverride All
     Order deny,allow
     Allow from all
-</Directory>
-<Directory /var/lib/dolibarr>
+</DirectoryMatch>
+<DirectoryMatch /var/lib/dolibarr>
     AllowOverride All
     Order deny,allow
     Allow from all
-</Directory>
+</DirectoryMatch>
diff --git a/build/rpm/httpd-dolibarr.conf b/build/rpm/httpd-dolibarr.conf
index 38af8c4839e..e1fcb3f77e5 100644
--- a/build/rpm/httpd-dolibarr.conf
+++ b/build/rpm/httpd-dolibarr.conf
@@ -1,28 +1,79 @@
-Alias /dolibarr /var/www/dolibarr/htdocs
+# Apache config file for Dolibarr
 
-<DirectoryMatch /var/www/dolibarr/>
+<IfModule mod_alias.c>
+Alias /dolibarr /var/www/dolibarr/htdocs
+</IfModule>
+
+# You can also use phpLDAPadmin as a VirtualHost
+# <VirtualHost *:*>
+#     ServerName mydolibarrhostname.com
+#     ServerAdmin root@example.com
+#     DocumentRoot /usr/share/dolibarr/
+#     ErrorLog logs/ldap.example.com-error.log
+#     CustomLog logs/ldap.example.com-access.log common
+# </VirtualHost>
+
+# Directory for web pages
+<DirectoryMatch /var/www/dolibarr>
+  Order deny,allow
+  Allow from all
+  DirectoryIndex index.php
   Options +FollowSymLinks +Indexes
 
-  ErrorDocument 401 /public/error-401.html
+  ErrorDocument 401 /public/error-401.php
   ErrorDocument 404 /public/error-404.php
 
   <IfModule mod_php4.c>
     php_flag magic_quotes_gpc Off
+    php_flag register_globals Off
   </IfModule>
+
   <IfModule mod_php5.c>
     php_flag magic_quotes_gpc Off
+    php_flag register_globals Off
   </IfModule>
 
+
+    # OPTIMIZE: To use gzip compressed files (for Dolibarr already compressed files).
+    # Note that constant MAIN_OPTIMIZE_SPEED must have a value with bit 0 set. 
+    #AddType text/javascript .jgz
+    #AddEncoding gzip .jgz
+    
+    # OPTIMIZE: To use gzip compression (on the fly).
+    # Note that you must also enable the module mod_deflate.
+    # You can also set this with constant MAIN_OPTIMIZE_SPEED and bit 2 set. 
+    #TODO
+    
+    # OPTIMIZE: To use cache on static pages (A259200 = 1 month).
+    # Note that you must also enable the module mod_expires.
+    #ExpiresActive On
+    #ExpiresByType image/x-icon A2592000
+    #ExpiresByType image/gif A2592000
+    #ExpiresByType image/png A2592000
+    #ExpiresByType image/jpeg A2592000
+    #ExpiresByType text/css A2592000
+    #ExpiresByType text/javascript A2592000
+    #ExpiresByType application/x-javascript A2592000
+    #ExpiresByType application/javascript A2592000
+    
 </DirectoryMatch>
 
-<DirectoryMatch /var/www/dolibarr/public/>
+# Directory for public pages
+<DirectoryMatch /var/www/dolibarr/public>
     AllowOverride All
     Order deny,allow
     Allow from all
 </DirectoryMatch>
 
-<DirectoryMatch /var/www/dolibarr/theme/>
+# Directory for data files
+<DirectoryMatch /usr/share/dolibarr/documents>
     AllowOverride All
     Order deny,allow
     Allow from all
 </DirectoryMatch>
+<DirectoryMatch /var/www/dolibarr/documents>
+    AllowOverride All
+    Order deny,allow
+    Allow from all
+</DirectoryMatch>
+