diff --git a/lam/HISTORY b/lam/HISTORY
index 8db92504..adc42a38 100644
--- a/lam/HISTORY
+++ b/lam/HISTORY
@@ -1,8 +1,9 @@
 June 2015
-  - Requires PHP > 5.4.26
   - Microsoft IE 8 no longer supported
   - Security: added CSRF protection
   - Zarafa users: allow to change display format of "Send As"
+  - LAM Pro:
+   -> Password Self Reset: added 389 Directory Server schema file
 
 
 31.03.2015 4.9
diff --git a/lam/docs/manual-sources/howto.xml b/lam/docs/manual-sources/howto.xml
index f5c5b2c3..77928569 100644
--- a/lam/docs/manual-sources/howto.xml
+++ b/lam/docs/manual-sources/howto.xml
@@ -66,7 +66,7 @@
 
     <itemizedlist>
       <listitem>
-        <para>PHP5 (&gt;= 5.4.26)</para>
+        <para>PHP5 (&gt;= 5.3.2)</para>
       </listitem>
 
       <listitem>
@@ -126,12 +126,12 @@ Have fun!
 
       <itemizedlist>
         <listitem>
-          <para>admin interface to manage all sorts of different LDAP entries
+          <para>Admin interface to manage all sorts of different LDAP entries
           (e.g. users/groups/hosts)</para>
         </listitem>
 
         <listitem>
-          <para>self service (LAM Pro) where end users can edit their own
+          <para>Self service (LAM Pro) where end users can edit their own
           data</para>
         </listitem>
       </itemizedlist>
@@ -146,6 +146,79 @@ Have fun!
         </mediaobject>
       </screenshot>
 
+      <para><emphasis role="bold">Admin interface</emphasis></para>
+
+      <para>This is the main part of the application. It allows to manage a
+      large list of LDAP entries (e.g. users, groups, DNS entries, ...). This
+      part is accessed by LDAP admins and support staff.</para>
+
+      <screenshot>
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="images/bigPicture2.png" />
+          </imageobject>
+        </mediaobject>
+      </screenshot>
+
+      <para>Functional areas:</para>
+
+      <orderedlist>
+        <listitem>
+          <para>Account tabs: These tabs allow to switsch between different
+          account types</para>
+        </listitem>
+
+        <listitem>
+          <para>Tree view: Provides an LDAP browser to edit LDAP entries on
+          attribute level</para>
+        </listitem>
+
+        <listitem>
+          <para>Tools menu: Contains useful tools such as profile and PDF
+          editor</para>
+        </listitem>
+
+        <listitem>
+          <para>Help: Link to manual</para>
+        </listitem>
+
+        <listitem>
+          <para>Logout: Logout of the application</para>
+        </listitem>
+
+        <listitem>
+          <para>List view: Lists all entries of the selected account type
+          (e.g. users)</para>
+        </listitem>
+
+        <listitem>
+          <para>List configuration: Configuration settings for list view (e.g.
+          number of entries per page)</para>
+        </listitem>
+
+        <listitem>
+          <para>Filter: Filter boxes allow to enter simple filters like
+          "a*"</para>
+        </listitem>
+      </orderedlist>
+
+      <para><emphasis role="bold">Self Service</emphasis></para>
+
+      <para>The self service provides a simple interface for your users to
+      edit their own data (e.g. telephone number). It also supports user self
+      registration and password reset functionality.</para>
+
+      <para>You can fully customize the layout of the self service
+      page.</para>
+
+      <screenshot>
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="images/bigPicture3.png" />
+          </imageobject>
+        </mediaobject>
+      </screenshot>
+
       <para><emphasis role="bold">Configuration</emphasis></para>
 
       <para>Configuration is done on multiple levels:</para>
@@ -161,9 +234,9 @@ Have fun!
       <para><emphasis role="bold">Server profile</emphasis></para>
 
       <para>All settings for an LDAP connection (e.g. server name, LDAP
-      suffixes, account types/modules to activate). There may be multiple for
-      one LDAP server (e.g. for multiple departments, different user groups,
-      ...).</para>
+      suffixes, account types/modules to activate) in admin interface. There
+      may be multiple for one LDAP server (e.g. for multiple departments,
+      different user groups, ...).</para>
 
       <para>Configured via LAM admin login -&gt; LAM configuration -&gt; <link
       linkend="serverProfiles">Edit server profile</link>.</para>
@@ -178,12 +251,13 @@ Have fun!
 
       <para><emphasis role="bold">Profiles</emphasis></para>
 
-      <para>Stores default values for new LDAP entries.</para>
+      <para><link linkend="a_accountProfile">Account profiles</link> store
+      default values for new LDAP entries.</para>
 
       <para><emphasis role="bold">PDF structures</emphasis></para>
 
-      <para>Defines the layout and list of data fields to include in PDF
-      export.</para>
+      <para><link linkend="pdfEditor">PDF structures</link> define the layout
+      and list of data fields to include in PDF export.</para>
     </section>
 
     <section>
@@ -217,12 +291,6 @@ Have fun!
               <entry>Type of an LDAP entry (e.g. user/group/host)</entry>
             </row>
 
-            <row>
-              <entry></entry>
-
-              <entry></entry>
-            </row>
-
             <row>
               <entry>Admin interface</entry>
 
@@ -230,6 +298,13 @@ Have fun!
               users)</entry>
             </row>
 
+            <row>
+              <entry>Lamdaemon</entry>
+
+              <entry>Support script to manage user file system quotas and
+              create home directories</entry>
+            </row>
+
             <row>
               <entry>PDF editor</entry>
 
@@ -6418,7 +6493,7 @@ OK (10 msec)</programlisting>
       </screenshot>
     </section>
 
-    <section>
+    <section id="pdfEditor">
       <title>PDF editor</title>
 
       <para>All accounts in LAM may be exported as PDF files. You can specify
@@ -9647,8 +9722,11 @@ OK (10 msec)</programlisting>
 
       <para><emphasis role="bold">389 server</emphasis></para>
 
-      <literallayout>  cp passwordSelfReset-389server.ldif /etc/dirsrv/slapd-pdxnpldap03/schema
-  service dirsrv restart
+      <para>Please replace INSTANCE with installation ID, e.g.
+      slapd-389ds.</para>
+
+      <literallayout>  cp passwordSelfReset-389server.ldif /etc/dirsrv/INSTANCE/schema/70pwdreset.ldif
+  systemctl restart dirsrv.target
 
 </literallayout>
 
diff --git a/lam/docs/manual-sources/images/bigPicture2.png b/lam/docs/manual-sources/images/bigPicture2.png
new file mode 100644
index 00000000..a505b854
Binary files /dev/null and b/lam/docs/manual-sources/images/bigPicture2.png differ
diff --git a/lam/docs/manual-sources/images/bigPicture3.png b/lam/docs/manual-sources/images/bigPicture3.png
new file mode 100644
index 00000000..df25e371
Binary files /dev/null and b/lam/docs/manual-sources/images/bigPicture3.png differ