diff --git a/lam/HISTORY b/lam/HISTORY
index c2e9ff2a..cc39f108 100644
--- a/lam/HISTORY
+++ b/lam/HISTORY
@@ -1,11 +1,13 @@
-??? 2.1.0
+07.11.2007 2.1.0
   - tabular design for account pages
   - show DN on account pages
   - Samba 3: made Samba account optional
+  - Samba 3: manages now terminal server settings
   - fixed bugs:
    -> LAM Pro: UTF-8 characters are invalid displayed on configuration page (1788752)
    -> LAM works again on PHP 5.1.x (1792447)
    -> Quota: managing group quotas does not work (1811728)
+   -> Samba 3 domains: lockout users after bad logon attempts must allow 0 - 999 (1814578)
 
 
 08.08.2007 2.0.0
diff --git a/lam/TODO b/lam/TODO
index f25825d4..ad9b1f37 100644
--- a/lam/TODO
+++ b/lam/TODO
@@ -7,7 +7,7 @@ LAM 2.1.x
 
  - tabular design for account pages (done)
  - show DN on account pages (done)
- - Samba 3: manage terminal server options
+ - Samba 3: manage terminal server options (done)
 
 
 LAM 2.2.x
diff --git a/lam/VERSION b/lam/VERSION
index 3e8098c8..fd358a2c 100644
--- a/lam/VERSION
+++ b/lam/VERSION
@@ -1 +1 @@
-2.1.0.CVS
+2.1.0.RC1
diff --git a/lam/docs/README.upgrade.txt b/lam/docs/README.upgrade.txt
index 9028b924..7673bb9d 100644
--- a/lam/docs/README.upgrade.txt
+++ b/lam/docs/README.upgrade.txt
@@ -12,6 +12,8 @@ Style changes:
 baseModule:
   - The class variable $base is no longer visible in child classes. Please use
     $this->getAccountContainer() to access the accountContainer object.
+  - Several other class variables in accountContainer etc. are now private.
+    Use the new access methods.