diff --git a/lam-web/changelog/index.htm b/lam-web/changelog/index.htm
index 149a02cf..b3d98db7 100644
--- a/lam-web/changelog/index.htm
+++ b/lam-web/changelog/index.htm
@@ -247,10 +247,12 @@ google_color_text = "000000";
 <h1>Changelog</h1>
 <br>
 <p> </p>
+
+
 <table cellspacing="0" width="100%">
   <tbody>
     <tr>
-      <th colspan="2">Sunday 22th July 2007 - 2.0.0.RC1 (test release)</th>
+      <th colspan="2">Wednesday 8th August 2007 - 2.0.0</th>
     </tr>
     <tr>
       <td>
diff --git a/lam-web/download/index.htm b/lam-web/download/index.htm
index 7cc1ebb3..06e353a5 100755
--- a/lam-web/download/index.htm
+++ b/lam-web/download/index.htm
@@ -258,19 +258,19 @@ google_color_text = "000000";
 <table cellspacing="0" width="70%">
   <tbody>
     <tr>
-      <th colspan="2" width="100%">LDAP Account Manager 2.0.0.RC1 (test release)</th>
+      <th colspan="2" width="100%">LDAP Account Manager 2.0.0</th>
     </tr>
     <tr>
-      <td> <a class="download" href="http://prdownloads.sourceforge.net/lam/ldap-account-manager-2.0.0.RC1.tar.gz?download">&nbsp;-
-Source code - ldap-account-manager-2.0.0.RC1.tar.gz</a> </td>
+      <td> <a class="download" href="http://prdownloads.sourceforge.net/lam/ldap-account-manager-2.0.0.tar.gz?download">&nbsp;-
+Source code - ldap-account-manager-2.0.0.tar.gz</a> </td>
     </tr>
     <tr>
-      <td> <a class="download" href="http://prdownloads.sourceforge.net/lam/ldap-account-manager_2.0.0.RC1-1_all.deb?download">&nbsp;-
-Debian package - ldap-account-manager_2.0.0.RC1-1_all.deb</a> </td>
+      <td> <a class="download" href="http://prdownloads.sourceforge.net/lam/ldap-account-manager_2.0.0-1_all.deb?download">&nbsp;-
+Debian package - ldap-account-manager_2.0.0-1_all.deb</a> </td>
     </tr>
     <tr>
-      <td> <a class="download" href="http://prdownloads.sourceforge.net/lam/ldap-account-manager-2.0.0.RC1-1.noarch.rpm?download">&nbsp;-
-RPM package - ldap-account-manager-2.0.0.RC1-1.noarch.rpm</a> </td>
+      <td> <a class="download" href="http://prdownloads.sourceforge.net/lam/ldap-account-manager-2.0.0-1.noarch.rpm?download">&nbsp;-
+RPM package - ldap-account-manager-2.0.0-1.noarch.rpm</a> </td>
     </tr>
   </tbody>
 </table>
diff --git a/lam-web/live-demo/index.htm b/lam-web/live-demo/index.htm
index 49c6da66..7d7550ea 100755
--- a/lam-web/live-demo/index.htm
+++ b/lam-web/live-demo/index.htm
@@ -253,8 +253,11 @@ LDAP Account Manager on a machine on the internet and check out its
 features.</p>
 <p><br>
 <br>
+Unfortunately, there is currently no LAM demo server. If you are interested in hosting a demo server
+please mail <a href="mailto:post@rolandgruber.de">Roland Gruber</a>.
+<!--
 <a href="http://intech009.intech.unu.edu/lam/lam-stable/">Demo server 1 (last stable release)</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The password is "secret".
-<br><!--
+<br>
 <a href="http://intech009.intech.unu.edu/lam/lam-cvsdemo/">Demo server 1 (CVS)</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The password is "secret".
 <br>-->
 <br>
diff --git a/lam-web/news/index.htm b/lam-web/news/index.htm
index bd521280..62dd0b4a 100755
--- a/lam-web/news/index.htm
+++ b/lam-web/news/index.htm
@@ -251,13 +251,12 @@ google_color_text = "000000";
 <table cellspacing="0" width="100%">
   <tbody>
     <tr>
-      <th>Sunday 22th July 2007 - 2.0.0.RC1</th>
+      <th>Wednesday 8th August 2007 - 2.0.0</th>
     </tr>
     <tr>
       <td>This is the first release which requires PHP5. It includes two
 new translations (Simplified Chinese and Czech) and includes
-several bug fixes and minor improvements.<br><br>
-This is a test release. Do not use it in productive environments!</td>
+several bug fixes and minor improvements.</td>
     </tr>
   </tbody>
 </table>
diff --git a/lam-web/todo/bugs.htm b/lam-web/todo/bugs.htm
index de3fd0cc..5e548fe2 100644
--- a/lam-web/todo/bugs.htm
+++ b/lam-web/todo/bugs.htm
@@ -252,6 +252,19 @@ Please use our <a href="http://sourceforge.net/tracker/?group_id=73243&amp;atid=
 
 <h1>Known bugs</h1>
 
+<h2>LAM 2.0.0</h2>
+<table style="border-spacing:0px">
+<tr>
+	<th>&nbsp;Severity&nbsp;</th>
+	<th>&nbsp;BTS link&nbsp;</th>
+	<th>&nbsp;Description&nbsp;</th>
+</tr>
+<tr>
+	<td colspan=3 class="bugOther">No known bugs</td>
+</tr>
+</table>
+<br>
+
 <h2>LAM 1.3.0</h2>
 <table style="border-spacing:0px">
 <tr>