diff --git a/lam/HISTORY b/lam/HISTORY
index 2cd10c6e..e08c4d05 100644
--- a/lam/HISTORY
+++ b/lam/HISTORY
@@ -1,5 +1,6 @@
 November 2011 3.6.0
   - Zarafa 7 support
+  - support HTTP authentication for admin pages and self service
   - new modules
    -> authorizedServiceObject
 
diff --git a/lam/docs/manual-sources/howto.xml b/lam/docs/manual-sources/howto.xml
index 147fa2e5..eb7bfd0b 100644
--- a/lam/docs/manual-sources/howto.xml
+++ b/lam/docs/manual-sources/howto.xml
@@ -3505,6 +3505,16 @@ Have fun!
               name + password, email + password or other attributes.</entry>
             </row>
 
+            <row>
+              <entry>HTTP authentication</entry>
+
+              <entry>You can enable HTTP authentication for your users. This
+              way the web server is responsible to authenticate your users.
+              LAM will use the given user name + password for the LDAP login.
+              To setup HTTP authentication in Apache please see this <ulink
+              url="http://httpd.apache.org/docs/2.2/howto/auth.html">link</ulink>.</entry>
+            </row>
+
             <row>
               <entry>Login attribute label</entry>
 
diff --git a/lam/docs/manual-sources/images/conf4.jpg b/lam/docs/manual-sources/images/conf4.jpg
index 4c3d5aca..7928b69d 100644
Binary files a/lam/docs/manual-sources/images/conf4.jpg and b/lam/docs/manual-sources/images/conf4.jpg differ
diff --git a/lam/docs/manual-sources/images/conf5.jpg b/lam/docs/manual-sources/images/conf5.jpg
index 428e5a1d..938a1922 100644
Binary files a/lam/docs/manual-sources/images/conf5.jpg and b/lam/docs/manual-sources/images/conf5.jpg differ
diff --git a/lam/docs/manual-sources/images/configCSS.png b/lam/docs/manual-sources/images/configCSS.png
index 2fd30206..6652f0a5 100644
Binary files a/lam/docs/manual-sources/images/configCSS.png and b/lam/docs/manual-sources/images/configCSS.png differ
diff --git a/lam/docs/manual-sources/images/configPageHeader.png b/lam/docs/manual-sources/images/configPageHeader.png
index 486a4116..c14eb6aa 100644
Binary files a/lam/docs/manual-sources/images/configPageHeader.png and b/lam/docs/manual-sources/images/configPageHeader.png differ
diff --git a/lam/lib/selfService.inc b/lam/lib/selfService.inc
index 84a5a16d..f9736ae5 100644
--- a/lam/lib/selfService.inc
+++ b/lam/lib/selfService.inc
@@ -3,7 +3,7 @@
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2006  Roland Gruber
+  Copyright (C) 2006 - 2011  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -273,6 +273,9 @@ class selfServiceProfile {
 	/** LDAP search attribute */
 	public $searchAttribute;
 	
+	/** HTTP authentication */
+	public $httpAuthentication;
+	
 	/** header for self service pages */
 	public $pageHeader;
 	
@@ -310,6 +313,7 @@ class selfServiceProfile {
 		$this->LDAPUser = "";
 		$this->LDAPPassword = "";
 		$this->searchAttribute = "uid";
+		$this->httpAuthentication = false;
 		$this->pageHeader = '<table border=0 width="100%" class="lamHeader ui-corner-all"><tr><td align="left" height="30"><a class="lamHeader" href="http://www.ldap-account-manager.org/" target="new_window">&nbsp;<img src="../../graphics/logo32.png" width=24 height=24 class="align-middle" alt="LDAP Account Manager">&nbsp;&nbsp;LDAP Account Manager</a></td></tr></table><br>';
 		$this->additionalCSS = '';
 		$this->loginCaption = "Welcome to LAM self service. Please enter your user name and password.";