diff --git a/lam/HISTORY b/lam/HISTORY
index 3c4efb22..c4525e65 100644
--- a/lam/HISTORY
+++ b/lam/HISTORY
@@ -1,4 +1,5 @@
 September 2014 4.7
+  - Nginx webserver support
   - Personal: support pager attribute (hidden by default)
   - renamed config/lam.conf_sample to lam.conf.sample and config.cfg_sample to config.cfg.sample
   - LAM Pro:
diff --git a/lam/docs/manual-sources/howto.xml b/lam/docs/manual-sources/howto.xml
index c7686f07..cd2001ab 100644
--- a/lam/docs/manual-sources/howto.xml
+++ b/lam/docs/manual-sources/howto.xml
@@ -188,8 +188,8 @@ Have fun!
 
         <itemizedlist>
           <listitem>
-            <para>Apache webserver (SSL recommended) with PHP module (PHP 5
-            (&gt;= 5.2.4) with ldap, gettext, xml, openssl and optional
+            <para>Apache/Nginx webserver (SSL recommended) with PHP module
+            (PHP 5 (&gt;= 5.2.4) with ldap, gettext, xml, openssl and optional
             mcrypt)</para>
           </listitem>
 
@@ -473,6 +473,13 @@ Have fun!
             </listitem>
           </itemizedlist>
         </section>
+
+        <section>
+          <title>Webserver configuration</title>
+
+          <para>Please see the <link linkend="apache">Apache</link> or <link
+          linkend="nginx">Nginx</link> chapter.</para>
+        </section>
       </section>
 
       <section>
@@ -8681,7 +8688,7 @@ OK (10 msec)</programlisting>
       stored in the session file is also encrypted.</para>
     </section>
 
-    <section>
+    <section id="apache">
       <title>Apache configuration</title>
 
       <section>
@@ -8860,6 +8867,78 @@ OK (10 msec)</programlisting>
 &lt;/VirtualHost&gt;</programlisting>
       </section>
     </section>
+
+    <section id="nginx">
+      <title>Nginx configuration</title>
+
+      <para>There is no fully automatic setup of Nginx but LAM provides a
+      ready-to-use configuration file.</para>
+
+      <section>
+        <title>RPM based installations</title>
+
+        <para>The RPM package has dependencies on Apache. Therefore, Nginx is
+        not officially supported with this installation mode. Use tar.bz2 if
+        you are unsure.</para>
+
+        <para>However, the package also includes an Nginx configuration file.
+        Please include it in your server directive like this:</para>
+
+        <programlisting>server {
+        ...
+
+        include /etc/ldap-account-manager/lam.nginx.conf;
+
+        ...
+}</programlisting>
+      </section>
+
+      <section>
+        <title>DEB based installations</title>
+
+        <para>The LAM installation package ships with an Nginx configuration
+        file. Please include it in your server directive like this:</para>
+
+        <programlisting>server {
+        ...
+
+        include /etc/ldap-account-manager/lam.nginx.conf;
+
+        ...
+}</programlisting>
+      </section>
+
+      <section>
+        <title>tar.bz2 based installations</title>
+
+        <para>Please add the following configuration snippet to your server
+        directive.</para>
+
+        <para>You will need to change the alias location
+        ("/usr/share/ldap-account-manager") and fastcgi_pass
+        ("/var/run/php5-fpm.sock") to match your installation.</para>
+
+        <programlisting>location /lam {
+  index index.html;
+  alias /usr/share/ldap-account-manager;
+  autoindex off;
+
+  location ~ \.php$ {
+    fastcgi_split_path_info ^(.+\.php)(/.+)$;
+    fastcgi_pass unix:/var/run/php5-fpm.sock;
+    fastcgi_index index.php;
+    include fastcgi_params;
+  }
+
+  location ~ /lam/(tmp/internal|sess|config|lib|help|locale) {
+    deny all;
+    return 403;
+  }
+
+}
+</programlisting>
+      </section>
+    </section>
   </appendix>
 
   <appendix>