diff --git a/lam/HISTORY b/lam/HISTORY
index 1bb05654..fb41ac52 100644
--- a/lam/HISTORY
+++ b/lam/HISTORY
@@ -1,5 +1,6 @@
 March 2018 6.3
   - LAM Pro:
+   -> Support custom structural object classes with new custom type
    -> Support dynamic lists
 
 
diff --git a/lam/copyright b/lam/copyright
index 6b5dc3db..1e09f8c8 100644
--- a/lam/copyright
+++ b/lam/copyright
@@ -15,6 +15,7 @@ time.
 * lib/modules/aliasEntry.inc
 * lib/modules/automount.inc
 * lib/modules/bindDLZ.inc
+* lib/modules/customBaseType.inc
 * lib/modules/customFields.inc
 * lib/modules/customScripts.inc
 * lib/modules/device.inc
diff --git a/lam/docs/manual-sources/chapter-modules.xml b/lam/docs/manual-sources/chapter-modules.xml
index 1042b0af..abb36e83 100644
--- a/lam/docs/manual-sources/chapter-modules.xml
+++ b/lam/docs/manual-sources/chapter-modules.xml
@@ -4809,7 +4809,72 @@ OK (10 msec)</programlisting>
     </screenshot>
   </section>
 
-  <section>
+  <section id="mod_customTypes">
+    <title>Custom types (LAM Pro)</title>
+
+    <para>This account type allows you to manage any type of LDAP entries.
+    This is e.g. needed if you define your own structural object classes or
+    LAM does not yet provide a module for a structural object class.</para>
+
+    <para>Always use this together with <link
+    linkend="mod_customFields">Custom fields</link> to specify the LDAP
+    attributes.</para>
+
+    <para><emphasis role="bold">Configuration</emphasis></para>
+
+    <para>Add a custom account type in your server profile (you can also add
+    multiple if needed).</para>
+
+    <para><inlinemediaobject>
+        <imageobject>
+          <imagedata fileref="images/mod_customBaseType1.png"/>
+        </imageobject>
+      </inlinemediaobject></para>
+
+    <para>Then specify the root DN where the entries should be stored. Also
+    provide the attributes to show in list view and a unique label for your
+    entries.</para>
+
+    <para><inlinemediaobject>
+        <imageobject>
+          <imagedata fileref="images/mod_customBaseType2.png"/>
+        </imageobject>
+      </inlinemediaobject></para>
+
+    <para>On tab modules add the custom type module. You will also need the
+    <link linkend="mod_customFields">Custom fields</link> module to manage the
+    attributes.</para>
+
+    <para><inlinemediaobject>
+        <imageobject>
+          <imagedata fileref="images/mod_customBaseType3.png"/>
+        </imageobject>
+      </inlinemediaobject></para>
+
+    <para>Finally, switch to tab Module settings. Here you need to specify the
+    structural object class. Also configure the <link
+    linkend="mod_customFields">Custom fields</link> module to manage all your
+    attributes.</para>
+
+    <para><inlinemediaobject>
+        <imageobject>
+          <imagedata fileref="images/mod_customBaseType4.png"/>
+        </imageobject>
+      </inlinemediaobject></para>
+
+    <para><emphasis role="bold">Manage your entries</emphasis></para>
+
+    <para>You can now login to LAM and will see one tab for each configured
+    custom type.</para>
+
+    <para><inlinemediaobject>
+        <imageobject>
+          <imagedata fileref="images/mod_customBaseType5.png"/>
+        </imageobject>
+      </inlinemediaobject></para>
+  </section>
+
+  <section id="mod_customFields">
     <title>Custom fields (LAM Pro)</title>
 
     <para>This module allows you to manage LDAP attributes that are not
@@ -4857,7 +4922,8 @@ OK (10 msec)</programlisting>
 
     <itemizedlist>
       <listitem>
-        <para>structural object classes</para>
+        <para>structural object classes (supported by <link
+        linkend="mod_customTypes">Custom types</link>)</para>
       </listitem>
 
       <listitem>
diff --git a/lam/docs/manual-sources/images/mod_customBaseType1.png b/lam/docs/manual-sources/images/mod_customBaseType1.png
new file mode 100644
index 00000000..4dd7d42a
Binary files /dev/null and b/lam/docs/manual-sources/images/mod_customBaseType1.png differ
diff --git a/lam/docs/manual-sources/images/mod_customBaseType2.png b/lam/docs/manual-sources/images/mod_customBaseType2.png
new file mode 100644
index 00000000..95870974
Binary files /dev/null and b/lam/docs/manual-sources/images/mod_customBaseType2.png differ
diff --git a/lam/docs/manual-sources/images/mod_customBaseType3.png b/lam/docs/manual-sources/images/mod_customBaseType3.png
new file mode 100644
index 00000000..9b30a064
Binary files /dev/null and b/lam/docs/manual-sources/images/mod_customBaseType3.png differ
diff --git a/lam/docs/manual-sources/images/mod_customBaseType4.png b/lam/docs/manual-sources/images/mod_customBaseType4.png
new file mode 100644
index 00000000..79df49c5
Binary files /dev/null and b/lam/docs/manual-sources/images/mod_customBaseType4.png differ
diff --git a/lam/docs/manual-sources/images/mod_customBaseType5.png b/lam/docs/manual-sources/images/mod_customBaseType5.png
new file mode 100644
index 00000000..257bb751
Binary files /dev/null and b/lam/docs/manual-sources/images/mod_customBaseType5.png differ
diff --git a/lam/style/500_layout.css b/lam/style/500_layout.css
index 881efa77..b4bc5758 100644
--- a/lam/style/500_layout.css
+++ b/lam/style/500_layout.css
@@ -798,7 +798,7 @@ h4.schema_oclass_sub {
 .nsviewType-bright { background:#fff3c8 !important; }
 .nsviewType-dark { background-color:#ffe27f !important; }
 
-.customType-border { border-color:#00a69c; }
-.customType-bright { background:#e1fffd !important; }
-.customType-dark { background-color:#91f1eb !important; }
+.customType-border { border-color:#b87500; }
+.customType-bright { background:#ffe3b1 !important; }
+.customType-dark { background-color:#e1b974 !important; }