diff --git a/lam/HISTORY b/lam/HISTORY
index 3710dc14..b48f7280 100644
--- a/lam/HISTORY
+++ b/lam/HISTORY
@@ -1,4 +1,5 @@
 30.04.2008 2.3.0
+  - added Polish translation
   - support phpGroupWare accounts
   - password policies
   - redesigned PDF editor
diff --git a/lam/README b/lam/README
index dd00c826..205d27a9 100644
--- a/lam/README
+++ b/lam/README
@@ -10,8 +10,8 @@ LAM - Readme
   viewer included to allow access to the raw LDAP attributes. You can use
   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, Portuguese,
-  Russian and Spanish.
+  Dutch, English, French, German, Hungarian, Italian, Japanese, Polish,
+  Portuguese, Russian and Spanish.
 
   http://sourceforge.net/projects/lam/
 
diff --git a/lam/config/language b/lam/config/language
index 52f4bf3a..61d66b77 100644
--- a/lam/config/language
+++ b/lam/config/language
@@ -32,6 +32,9 @@ it_IT.utf8:UTF-8:Italiano (Italia)
 # Hungarian
 hu_HU.utf8:UTF-8:Magyar (Magyarország)
 
+# Polish
+pl_PL.utf8:UTF-8:Polski (Polska)
+
 # Portuguese
 pt_BR.utf8:UTF-8:Português (Brasil)
 
diff --git a/lam/po/make_all b/lam/po/make_all
index e7cec041..252d0b82 100755
--- a/lam/po/make_all
+++ b/lam/po/make_all
@@ -1,7 +1,7 @@
 #!/bin/bash
 # $Id$
 #
-# Copyright (C) 2004 - 2006  Roland Gruber
+# Copyright (C) 2004 - 2008  Roland Gruber
 # This code is part of LDAP Account Manager (http://www.sourceforge.net/projects/lam)
 
 # This script is run to create archives of all messages.po files.
@@ -57,6 +57,11 @@ echo "Generating Japanese translation template"
 tar -czf messages.po_jp.tar.gz messages.po
 echo " "
 
+echo "Generating Polish translation template"
+./make_po_pl
+tar -czf messages.po_pl.tar.gz messages.po
+echo " "
+
 echo "Generating Portuguese translation template"
 ./make_po_pt
 tar -czf messages.po_pt.tar.gz messages.po
diff --git a/lam/po/make_po_pl b/lam/po/make_po_pl
new file mode 100755
index 00000000..1172f945
--- /dev/null
+++ b/lam/po/make_po_pl
@@ -0,0 +1,10 @@
+#!/bin/bash
+# $Id$
+#
+# Copyright (C) 2008  Roland Gruber
+# This code is part of LDAP Account Manager (http://www.sourceforge.net/projects/lam)
+
+# This script is run after make_po to merge the existing Polish translations to messages.po
+
+./make_po
+msgmerge -v ../locale/pl_PL/LC_MESSAGES/messages.po messages.po -o messages.po
\ No newline at end of file