diff --git a/docs/resources/simplesamlphp-install/screenshot-installationpage.png b/docs/resources/simplesamlphp-install/screenshot-installationpage.png
index b9337f1159d574a4483bd031d9cbc2d4fc4ca1d4..869391566c3db42eaa5622bf59f58c4fdaed27d5 100644
Binary files a/docs/resources/simplesamlphp-install/screenshot-installationpage.png and b/docs/resources/simplesamlphp-install/screenshot-installationpage.png differ
diff --git a/docs/source/simplesamlphp-googleapps.xml b/docs/source/simplesamlphp-googleapps.xml
index e318f9464dc57e7400010cea4626e03a8cf966b4..ef05f4d8886a256e2e59463677138411a71854f1 100644
--- a/docs/source/simplesamlphp-googleapps.xml
+++ b/docs/source/simplesamlphp-googleapps.xml
@@ -8,7 +8,7 @@
   <articleinfo>
     <date>2007-10-15</date>
 
-    <pubdate>Sun Oct 21 13:51:26 2007</pubdate>
+    <pubdate>Sat Mar  8 22:40:15 2008</pubdate>
 
     <author>
       <firstname>Andreas Ă…kre</firstname>
diff --git a/docs/source/simplesamlphp-install.xml b/docs/source/simplesamlphp-install.xml
index aebd339fe7eb5735d4342c1cf0119b1f287c133f..b55cc3d23fedfc91351a56404535390aa346a2b8 100644
--- a/docs/source/simplesamlphp-install.xml
+++ b/docs/source/simplesamlphp-install.xml
@@ -7,7 +7,7 @@
   <articleinfo>
     <date>2007-08-30</date>
 
-    <pubdate>Wed Mar  5 08:15:51 2008</pubdate>
+    <pubdate>Sat Mar 8 22:44:07 2008</pubdate>
 
     <author>
       <firstname>Andreas Ă…kre</firstname>
@@ -18,21 +18,15 @@
     </author>
   </articleinfo>
 
-  <warning>
-    <para>This version of this document is work in progress. We are currently
-    working on updating the document to</para>
-  </warning>
-
   <section>
     <title>News about simpleSAMLphp</title>
 
     <para>To get the latest news about simpleSAMLphp you can follow this url:
     <ulink
-    url="http://rnd.feide.no/taxonomy/term/4">http://rnd.feide.no/taxonomy/term/4</ulink>.</para>
-
-    <para>Here is the simpleSAMLphp homepage:</para>
+    url="http://rnd.feide.no/taxonomy/term/4">http://rnd.feide.no/taxonomy/term/4</ulink>.
+    It also conatins a RSS feed.</para>
 
-    <para><ulink
+    <para>Here is the simpleSAMLphp homepage: <ulink
     url="http://rnd.feide.no/simplesamlphp">http://rnd.feide.no/simplesamlphp</ulink></para>
   </section>
 
@@ -66,6 +60,41 @@ svn up</screen>
     </section>
   </section>
 
+  <section>
+    <title>Upgrading from a previous version of simpleSAMLphp</title>
+
+    <para>If you run a the subversion version, you can just type in:</para>
+
+    <screen>svn update</screen>
+
+    <para>in the root folder of your simpleSAMLphp installation. If you did
+    download and install the zipped version, you should take backup of the
+    config and the metadata directories, and then replace your simpleSAMLphp
+    directory with the new version.</para>
+
+    <para>After updating from subversion or from a newer release as a zip
+    file, you will need to update your configuration and metadata. This is
+    only neccessary if the format of the config files or metadata has changed
+    between the version you ran and the one you are upgrading to.</para>
+
+    <section>
+      <title>Upgrading config.php</title>
+
+      <para>A good approach is to run a diff between your preivous config.php
+      file and the new config.php file located in config-templates/config.php,
+      and apply your modifications to the new template. Then you make sure
+      that all new entries in the latest version of config.php are included,
+      as well as your local modifications are preserved.</para>
+    </section>
+
+    <section>
+      <title>Upgrading metadata files</title>
+
+      <para>Most likely the metadata format is backward compatible. Otherwise
+      it shold</para>
+    </section>
+  </section>
+
   <section>
     <title>Making configuration and metadata files</title>
 
diff --git a/docs/source/simplesamlphp-maintenance.xml b/docs/source/simplesamlphp-maintenance.xml
index 4456adfedb26c77a242a0c639f98e21d467e2b87..b46a03823c53258b1245efbbc995864bd85cab08 100644
--- a/docs/source/simplesamlphp-maintenance.xml
+++ b/docs/source/simplesamlphp-maintenance.xml
@@ -7,7 +7,7 @@
   <articleinfo>
     <date>2007-08-30</date>
 
-    <pubdate>Wed Feb 13 10:16:12 2008</pubdate>
+    <pubdate>Sat Mar  8 22:40:37 2008</pubdate>
 
     <author>
       <firstname>Andreas Ă…kre</firstname>