diff --git a/lam/HISTORY b/lam/HISTORY
index a48816c1..b2c5c975 100644
--- a/lam/HISTORY
+++ b/lam/HISTORY
@@ -6,7 +6,7 @@ December 2013 4.4
   - Unix: switch also additional membership if primary group is changed (RFE 108)
   - Windows: fixed user name handling, sAMAccountName now optional
   - Apache 2.4 support (requires Apache "version" module)
-  - added Turkish and US English translation
+  - added Turkish, Ukrainian and US English translation
   - LAM Pro:
    -> Bind DLZ support
    -> Samba/Shadow: display password change date in self service
diff --git a/lam/README b/lam/README
index 8d7cbb1c..45f89438 100644
--- a/lam/README
+++ b/lam/README
@@ -11,7 +11,7 @@ LAM - Readme
   templates for account creation and use multiple configuration profiles.
   LAM is translated to Catalan, Chinese (Traditional + Simplified), Czech,
   Dutch, English, French, German, Hungarian, Italian, Japanese, Polish,
-  Portuguese, Russian, Slovak, Spanish and Turkish.
+  Portuguese, Russian, Slovak, Spanish, Turkish and Ukrainian.
 
   https://www.ldap-account-manager.org/
 
diff --git a/lam/docs/manual-sources/howto.xml b/lam/docs/manual-sources/howto.xml
index a8787676..03b16753 100644
--- a/lam/docs/manual-sources/howto.xml
+++ b/lam/docs/manual-sources/howto.xml
@@ -538,11 +538,17 @@ Have fun!
                 </row>
 
                 <row>
-                  <entry>English</entry>
+                  <entry>English - Great Britain</entry>
 
                   <entry>no extra locale needed</entry>
                 </row>
 
+                <row>
+                  <entry>English - USA</entry>
+
+                  <entry>en_US.utf8</entry>
+                </row>
+
                 <row>
                   <entry>French</entry>
 
@@ -608,6 +614,12 @@ Have fun!
 
                   <entry>tr_TR.utf8</entry>
                 </row>
+
+                <row>
+                  <entry>Ukrainian</entry>
+
+                  <entry>uk_UA.utf8</entry>
+                </row>
               </tbody>
             </tgroup>
           </table>
@@ -8203,7 +8215,8 @@ objectclass: top
 
     <para>Some basic hints to configure the OpenLDAP server:</para>
 
-    <para><emphasis role="bold">Size limit:</emphasis></para>
+    <para><emphasis id="size_limit_exceeded" role="bold">Size
+    limit:</emphasis></para>
 
     <para>You will get a message like "LDAP sizelimit exceeded, not all
     entries are shown." when you hit the LDAP search limit.</para>
@@ -8219,7 +8232,7 @@ objectclass: top
     <para>slapd.d:</para>
 
     <para>e.g. "olcSizeLimit: 10000" or "olcSizeLimit: -1" for unlimited
-    return values in etc/ldap/slapd.d/cn=config.ldif</para>
+    return values in /etc/ldap/slapd.d/cn=config.ldif</para>
 
     <literallayout>
 </literallayout>
@@ -8587,10 +8600,24 @@ objectclass: top
   <appendix>
     <title>Troubleshooting</title>
 
+    <para><emphasis role="bold">Size limit</emphasis></para>
+
+    <para>You will get a message like "LDAP sizelimit exceeded, not all
+    entries are shown." when you hit the LDAP search limit. See the <link
+    linkend="size_limit_exceeded">OpenLDAP settings</link> to fix this.</para>
+
+    <literallayout>
+</literallayout>
+
+    <para><emphasis role="bold">Invalid syntax errors:</emphasis></para>
+
     <para>If you get any strange errors like "Invalid syntax" or "Invalid DN
     syntax" please check if your LDAP schema matches LAM's
     requirements.</para>
 
+    <literallayout>
+</literallayout>
+
     <para><emphasis role="bold">Schema test:</emphasis></para>
 
     <para>This can be done by running "Tools" -&gt; "Tests" -&gt; "Schema
@@ -8609,11 +8636,15 @@ objectclass: top
       </mediaobject>
     </screenshot>
 
-    <para><emphasis role="bold">Logging:</emphasis></para>
+    <para><literallayout>
+</literallayout><emphasis role="bold">Logging:</emphasis></para>
 
     <para>If your schema is correct you can turn on LDAP logging to get more
     detailed error messages from your LDAP server.</para>
 
+    <literallayout>
+</literallayout>
+
     <para><emphasis role="bold">OpenLDAP logging:</emphasis></para>
 
     <itemizedlist>
diff --git a/lam/po/make_all b/lam/po/make_all
index 1c54b155..80422b73 100755
--- a/lam/po/make_all
+++ b/lam/po/make_all
@@ -85,4 +85,8 @@ echo "Generating Turkish translation template"
 ./make_po_tr
 tar -czf messages.po_tr.tar.gz messages.po
 
+echo "Generating Ukrainian translation template"
+./make_po_uk
+tar -czf messages.po_uk.tar.gz messages.po
+
 rm messages.po