diff --git a/docs/source/simplesamlphp-advancedfeatures.xml b/docs/source/simplesamlphp-advancedfeatures.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4e19ed4d51737952fa798cfb2ace6557b28f546f
--- /dev/null
+++ b/docs/source/simplesamlphp-advancedfeatures.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<article>
+  <title>simpleSAMLphp advanced features</title>
+
+  <section>
+    <title>Bridging between protocols</title>
+
+    <para>To setup a bridge between two protocols, you need to </para>
+  </section>
+
+  <section>
+    <title>Attribute control</title>
+
+    <para></para>
+
+    <section>
+      <title>Attribute filtering</title>
+
+      <para></para>
+    </section>
+
+    <section>
+      <title>Attribute name mapping</title>
+
+      <para></para>
+    </section>
+
+    <section>
+      <title>Attribute alter functions</title>
+
+      <para></para>
+    </section>
+  </section>
+</article>
\ No newline at end of file
diff --git a/docs/source/simplesamlphp-changelog.xml b/docs/source/simplesamlphp-changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..431608b0c9c01c50c5907899944b34a607eee4f5
--- /dev/null
+++ b/docs/source/simplesamlphp-changelog.xml
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<article>
+  <title>simpleSAMLphp changelog</title>
+
+  <section>
+    <title>History</title>
+
+    <para></para>
+  </section>
+
+  <section>
+    <title>Changelog</title>
+
+    <para>Here is changes between simpleSAML versions. Look here if you are
+    upgrading, to see if there are any changes to the config format.</para>
+
+    <section>
+      <title>Version 1.0</title>
+
+      <para>Release planned in March 2008.</para>
+    </section>
+
+    <section>
+      <title>Version 0.5</title>
+
+      <para>Released 2007-10-15. Revision 28.</para>
+
+      <warning>
+        <para>Both <filename>config.php</filename> and metadata format is
+        changed. Look at the templates to understand the new format.</para>
+      </warning>
+
+      <itemizedlist>
+        <listitem>
+          <para>Documentation is updated!</para>
+        </listitem>
+
+        <listitem>
+          <para>Metadata files have been more tidy. Removed unused entries.
+          Look at the new templates on how to change your existing
+          metadata.</para>
+        </listitem>
+
+        <listitem>
+          <para>Support for sending metadata on mail to Feide. Automatically
+          detecting if you have configured Feide as the default IdP.</para>
+        </listitem>
+
+        <listitem>
+          <para>Improved SAML 2.0 Metadata generation</para>
+        </listitem>
+
+        <listitem>
+          <para>Added support for Shibboleth 1.3 IdP functionality (beta,
+          contact me if any problems)</para>
+        </listitem>
+
+        <listitem>
+          <para>Added RADIUS authentication backend</para>
+        </listitem>
+
+        <listitem>
+          <para>Added support for HTTP-Redirect debugging when enable
+          <literal>debug=true</literal></para>
+        </listitem>
+
+        <listitem>
+          <para>SAML 2.0 SP example now contains a logout page.</para>
+        </listitem>
+
+        <listitem>
+          <para>Added new authentication backend with support for multiple
+          LDAP based on which organization the user selects.</para>
+        </listitem>
+
+        <listitem>
+          <para>Added SAML 2.0 Discovery Service</para>
+        </listitem>
+
+        <listitem>
+          <para>Initial proof of concept implementation of "User consent on
+          attribute release"</para>
+        </listitem>
+
+        <listitem>
+          <para>Fixed some minor bugs.</para>
+        </listitem>
+      </itemizedlist>
+    </section>
+
+    <section>
+      <title>Version 0.4</title>
+
+      <para>Released 2007-09-14. Revision X.</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>Improved documentation</para>
+        </listitem>
+
+        <listitem>
+          <para>Authentication plugin API. Only LDAP authenticaiton plugin is
+          included, but it is now easier to implement your own plugin.</para>
+        </listitem>
+
+        <listitem>
+          <para>Added support for SAML 2.0 IdP to work with Google Apps for
+          Education. Tested.</para>
+        </listitem>
+
+        <listitem>
+          <para>Initial implementation of SAML 2.0 Single Log-Out
+          functionality both for SP and IdP. Seems to work, but not yet
+          well-tested.</para>
+        </listitem>
+
+        <listitem>
+          <para>Added support for bridging SAML 2.0 to SAML 2.0.</para>
+        </listitem>
+
+        <listitem>
+          <para>Added some time skew offset to the NotBefore timestamp on the
+          assertion, to allow some time skew between the SP and IdP.</para>
+        </listitem>
+
+        <listitem>
+          <para>Fixed Browser/POST page to automaticly submit, and have fall
+          back functionality for user agents with no javascript
+          support.</para>
+        </listitem>
+
+        <listitem>
+          <para>Fixed some bug with warning traversing Shibboleth 1.3
+          Assertions.</para>
+        </listitem>
+
+        <listitem>
+          <para>Fixed tabindex on the login page of the LDAP authentication
+          module to allow you to tab from username, to password and then to
+          submit.</para>
+        </listitem>
+
+        <listitem>
+          <para>Fixed bug on autodiscovering hostname in multihost
+          environments.</para>
+        </listitem>
+
+        <listitem>
+          <para>Cleaned out some debug messages, and added a debug option in
+          the configuration file. This debug option let's you turn on the
+          possibility of showing all SAML messages to users in the web
+          browser, and manually submit them.</para>
+        </listitem>
+
+        <listitem>
+          <para>Several minor bugfixes.</para>
+        </listitem>
+      </itemizedlist>
+    </section>
+  </section>
+</article>
\ No newline at end of file
diff --git a/docs/source/simplesamlphp-configureshib13sp.xml b/docs/source/simplesamlphp-configureshib13sp.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9950f4e9224d19c8dc61beed38b9361d0ab92db9
--- /dev/null
+++ b/docs/source/simplesamlphp-configureshib13sp.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<article>
+  <title>Configuring a Shibboleth 1.3 SP to talk to simpleSAMLphp IdP</title>
+
+  <section>
+    <title>Background</title>
+
+    <para>You should have installed and configured simpleSAMLphp.</para>
+
+    <para>You should also have installed Shibboleth 1.3 SP.</para>
+  </section>
+
+  <section>
+    <title>Installing Shibboleth 1.3 SP</title>
+
+    <para></para>
+
+    <itemizedlist>
+      <listitem>
+        <para><ulink
+        url="http://www.switch.ch/aai/docs/shibboleth/SWITCH/1.3/sp/install-sp-1.3-debian-etch.html">SWITCH
+        documentation on installing Shibboleth 1.3 on Debian sarge
+        4.0</ulink></para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section>
+    <title>Configuration</title>
+
+    <para></para>
+  </section>
+</article>
\ No newline at end of file
diff --git a/docs/source/simplesamlphp-maintenance.xml b/docs/source/simplesamlphp-maintenance.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a26e7ee38f03999715b1b3349a4a60a7fea89d0a
--- /dev/null
+++ b/docs/source/simplesamlphp-maintenance.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<article>
+  <title>Advanced configuration and maintainance of simpleSAMLphp</title>
+
+  <articleinfo>
+    <date>2007-08-30</date>
+
+    <pubdate>Wed Dec 19 12:03:53 2007</pubdate>
+
+    <author>
+      <firstname>Andreas Ă…kre</firstname>
+
+      <surname>Solberg</surname>
+
+      <email>andreas.solberg@uninett.no</email>
+    </author>
+  </articleinfo>
+
+  <section>
+    <title>Session management </title>
+
+    <para>simpleSAMLphp has an abstraction layer for session management. That
+    means it is possible to choose between different kind of session stores,
+    as well as write new session store plugins.</para>
+
+    <para>The current version of simpleSAMLphp includes two plugins for
+    session management. </para>
+  </section>
+
+  <section>
+    <title>Load balancing and failover</title>
+
+    <para></para>
+  </section>
+
+  <section>
+    <title>Logging and statistics</title>
+
+    <para></para>
+  </section>
+
+  <section>
+    <title>Error handling, error reporting and metadata reporting</title>
+
+    <para></para>
+  </section>
+
+  <section>
+    <title>Multi-language support</title>
+
+    <para></para>
+  </section>
+
+  <section>
+    <title>Customizing the web frontend</title>
+
+    <para></para>
+  </section>
+</article>
\ No newline at end of file