diff --git a/xsl/footer.xsl b/xsl/footer.xsl
new file mode 100644
index 000000000..f0cfadab2
--- /dev/null
+++ b/xsl/footer.xsl
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0"                                                                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:rss="http://purl.org/rss/1.0/"
+  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+  xmlns:date="http://exslt.org/dates-and-times"                                               exclude-result-prefixes="xsl rss rdf">
+
+  <xsl:template name="footer">
+  <ul>
+    <li><a href="impressum.html">Impressum</a></li>
+    <li>
+    <!-- Creative Commons License -->
+      <xsl:comment>
+        <xsl:text> Creative Commons License </xsl:text>
+      </xsl:comment>
+      <a rel="license" href="http://creativecommons.org/licenses/by-sa/2.0/de/deed.de">
+        <img alt="Creative Commons License" src="http://creativecommons.org/images/public/somerights20.gif" title="Creative Commons Attribution-ShareAlike 2.0 Germany License" />
+      </a>
+      <xsl:comment>
+        <xsl:text>
+          &lt;rdf:RDF xmlns="http://web.resource.org/cc/"
+            xmlns:dc="http://purl.org/dc/elements/1.1/"
+            xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"&gt;
+            &lt;Work rdf:about=""&gt;
+              &lt;dc:type rdf:resource="http://purl.org/dc/dcmitype/Interactive" /&gt;
+              &lt;license rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/de/" /&gt;
+            &lt;/Work&gt;
+
+            &lt;License rdf:about="http://creativecommons.org/licenses/by-sa/2.0/de/"&gt;
+              &lt;permits rdf:resource="http://web.resource.org/cc/Reproduction" /&gt;
+              &lt;permits rdf:resource="http://web.resource.org/cc/Distribution" /&gt;
+              &lt;requires rdf:resource="http://web.resource.org/cc/Notice" /&gt;
+              &lt;requires rdf:resource="http://web.resource.org/cc/Attribution" /&gt;
+              &lt;permits rdf:resource="http://web.resource.org/cc/DerivativeWorks" /&gt;
+              &lt;requires rdf:resource="http://web.resource.org/cc/ShareAlike" /&gt;
+            &lt;/License&gt;
+          &lt;/rdf:RDF&gt;
+        </xsl:text>
+      </xsl:comment>
+    </li>
+    <li>
+      <a href="http://validator.w3.org/check?uri=referer">
+        <img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0 Strict" />
+      </a>
+    </li>
+  </ul>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/xsl/header.xsl b/xsl/header.xsl
new file mode 100644
index 000000000..59b936aab
--- /dev/null
+++ b/xsl/header.xsl
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0"                                                                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:rss="http://purl.org/rss/1.0/"
+  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+  xmlns:date="http://exslt.org/dates-and-times"                                               exclude-result-prefixes="xsl rss rdf">
+
+  <xsl:template name="header">
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  <meta name="description" content="&lt;&lt;&lt;/&gt;&gt; c3d2, der Erfahrungsaustauschkreis aus dem sächsischen Dresden" />
+  <meta name="keywords" content="c3d2 ccc dresden sachsen hacker" />
+  <meta name="robots" content="index,follow" />
+  <meta name="language" content="de" />
+  <meta name="author" content="Fnordic walker" />
+  <meta name="date" content="Jan 1 1970" />
+  
+  <meta name="DC.Creator" content="Fnordic walker" />
+  <meta name="DC.Description" content="&lt;&lt;&lt;/&gt;&gt; c3d2, der Erfahrungsaustauschkreis aus dem sächsischen Dresden" />
+  <meta name="DC.Publisher" content="Chaos Computer Club Dresden" />
+  <meta name="DC.Date" content="Jan 1 1970" />
+  <meta name="DC.Type" content="Text" />
+  <meta name="DC.Format" content="text/html" />
+  <meta name="DC.Language" content="de" />
+  <meta name="DC.Coverage" content="Dresden" />    
+  <meta name="DC.Title" content="c3d2: Chaos Computer Club Dresden" />
+  
+  <link rel="icon" href="" type="image/png" />
+  <link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="news-rss.xml" />
+  <link rel="stylesheet" title="Default" type="text/css" href="style/default.css" />
+  
+  <title>&lt;&lt;&lt;/&gt;&gt; Chaos Computer Club Dresden | c3d2</title>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/xsl/xhtml.xsl b/xsl/xhtml.xsl
index cbf0b8c90..456c14414 100644
--- a/xsl/xhtml.xsl
+++ b/xsl/xhtml.xsl
@@ -7,6 +7,8 @@
   exclude-result-prefixes="xsl rss rdf">
   
 <xsl:include href="date.xsl" />
+<xsl:include href="header.xsl" />
+<xsl:include href="footer.xsl" />
 
 <xsl:output method="xml" 
             version="1.0" 
@@ -20,181 +22,112 @@
       <!--xsl:attribute name="xmlns">http://www.w3.org/1999/xhtml</xsl:attribute-->
       <xsl:attribute name="lang">de</xsl:attribute>
       <xsl:attribute name="xml:lang">de</xsl:attribute>
-      <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <!--
-          ### Header ###
-            -->
-            <meta name="description" content="&lt;&lt;&lt;/&gt;&gt; c3d2, der Erfahrungsaustauschkreis aus dem sächsischen Dresden" />
-        <meta name="keywords" content="c3d2 ccc dresden sachsen hacker" />
-        <meta name="robots" content="index,follow" />
-        <meta name="language" content="de" />
-        <meta name="author" content="Fnordic walker" />
-        <meta name="date" content="Jan 1 1970" />
+      <xsl:element name="head">
+        <xsl:call-template name="header" />
+      </xsl:element>
 
-        <meta name="DC.Creator" content="Fnordic walker" />
-        <meta name="DC.Description" content="&lt;&lt;&lt;/&gt;&gt; c3d2, der Erfahrungsaustauschkreis aus dem sächsischen Dresden" />
-        <meta name="DC.Publisher" content="Chaos Computer Club Dresden" />
-        <meta name="DC.Date" content="Jan 1 1970" />
-        <meta name="DC.Type" content="Text" />
-        <meta name="DC.Format" content="text/html" />
-        <meta name="DC.Language" content="de" />
-        <meta name="DC.Coverage" content="Dresden" />    
-        <meta name="DC.Title" content="c3d2: Chaos Computer Club Dresden" />
-        
-        <link rel="icon" href="" type="image/png" />
-        <link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="news-rss.xml" />
-        <link rel="stylesheet" title="Default" type="text/css" href="style/default.css" />
-
-        <title>&lt;&lt;&lt;/&gt;&gt; Chaos Computer Club Dresden | c3d2</title>
-        
-      </head>
-
-      <body>
+      <xsl:element name="body">
         <div id="page">
-        <!--
-          ### Logo ###
-          -->
+          <!-- ### Logo ### -->
           <xsl:comment>
-            ### Logo ###
+            <xsl:text> ### Logo ### </xsl:text>
           </xsl:comment>
           <div id="logo">
             <h1>&lt;&lt;&lt;/&gt;&gt; Chaos Computer Club Dresden | c3d2</h1>
           </div>
+
           <div id="body">
-        <!--
-          ### Navigation ###
-          -->      
-            <xsl:comment>
-              ### Navigation ###
-            </xsl:comment>
-            <div id="navigation">
-        <!--
-          ### Search ###
-          --> 
-              <xsl:comment>
-                ### Search ###
-              </xsl:comment>
-              <form action="http://www.google.de/custom" method="get"> 
-                <p>
-                  <input type="text" name="q" size="20" value="c3d2" />
-                  <input type="hidden" name="domains" value="c3d2.de" />
-                  <input type="hidden" name="sitesearch" value="www.c3d2.de" />
-                  <input type="submit" name="submit" value="Suchen!" />
-                </p>
-              </form>
 
-              <ul>
-                <xsl:for-each select="document('../content/navigation.xml')/navigation/file">
-                  <xsl:call-template name="navitem"><xsl:with-param name="file" select="."/></xsl:call-template>
-                </xsl:for-each>
-              </ul>
-            </div>
-        <!--
-          ### Content ###
-          -->
-            <xsl:comment>
-              ### Content ###
-            </xsl:comment>
-            <div id="content">
-              <h2>
-                <xsl:choose>
-                  <xsl:when test="/page/@pagetitle">
-                    <xsl:value-of select="/page/@pagetitle"/>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:value-of select="/page/@title"/>
-                  </xsl:otherwise>
-                </xsl:choose>
-              </h2>
-              <xsl:apply-templates/>
-            </div>
-        <!--
-          ### News ###
-          -->
-            <xsl:comment>
-              ### News ###
-            </xsl:comment>
-            <div id="news">
-              <h2>
-                <xsl:element name="a">
-                  <xsl:attribute name="href">
-                    <xsl:value-of select="document('../chaosupdates.rdf')/rdf:RDF/rss:channel/rss:link"/>
-                  </xsl:attribute>
-                  <xsl:value-of select="document('../chaosupdates.rdf')/rdf:RDF/rss:channel/rss:title"/>
-                </xsl:element>
-              </h2>
-              <ul>
-                <xsl:for-each select="document('../chaosupdates.rdf')/rdf:RDF/rss:item[position() &lt; 14]">
-                  <li>
-                    <xsl:element name="a">
-                      <xsl:attribute name="href">
-                        <xsl:value-of select="rss:link"/>
-                      </xsl:attribute>
-                      <xsl:value-of select="rss:title"/>
-                    </xsl:element>
-                  </li>
-                </xsl:for-each>
-              </ul>
-            </div>
-         
-          </div>
-
-        <!--
-          ### Footer ###
-          -->
+          <!-- ### Navigation ### -->      
           <xsl:comment>
-            ### Footer ###
+            <xsl:text> ### Navigation ### </xsl:text>
+          </xsl:comment>
+          <div id="navigation">
+
+          <!-- ### Search ### --> 
+          <xsl:comment>
+            <xsl:text> ### Search ### </xsl:text>
+          </xsl:comment>
+
+          <form action="http://www.google.de/custom" method="get"> 
+            <p>
+              <input type="text" name="q" size="20" value="c3d2" />
+              <input type="hidden" name="domains" value="c3d2.de" />
+              <input type="hidden" name="sitesearch" value="www.c3d2.de" />
+              <input type="submit" name="submit" value="Suchen!" />
+            </p>
+          </form>
+
+          <ul>
+            <xsl:for-each select="document('../content/navigation.xml')/navigation/file">
+              <xsl:call-template name="navitem"><xsl:with-param name="file" select="."/></xsl:call-template>
+            </xsl:for-each>
+          </ul>
+          </div> <!-- id="navigation" -->
+          
+          <!-- ### Content ### -->
+          <xsl:comment>
+            <xsl:text> ### Content ### </xsl:text>
+          </xsl:comment>
+          <div id="content">
+            <h2>
+              <xsl:choose>
+                <xsl:when test="/page/@pagetitle">
+                  <xsl:value-of select="/page/@pagetitle"/>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:value-of select="/page/@title"/>
+                </xsl:otherwise>
+              </xsl:choose>
+            </h2>
+            <xsl:apply-templates/>
+          </div> <!-- id="content" -->
+
+          <!-- ### News ### -->
+          <xsl:comment>
+            <xsl:text> ### News ### </xsl:text>
+          </xsl:comment>
+          <div id="news">
+            <h2>
+              <xsl:element name="a">
+                <xsl:attribute name="href">
+                  <xsl:value-of select="document('../chaosupdates.rdf')/rdf:RDF/rss:channel/rss:link"/>
+                </xsl:attribute>
+                <xsl:value-of select="document('../chaosupdates.rdf')/rdf:RDF/rss:channel/rss:title"/>
+              </xsl:element>
+            </h2>
+            <ul>
+              <xsl:for-each select="document('../chaosupdates.rdf')/rdf:RDF/rss:item[position() &lt; 14]">
+                <li>
+                  <xsl:element name="a">
+                    <xsl:attribute name="href">
+                      <xsl:value-of select="rss:link"/>
+                    </xsl:attribute>
+                    <xsl:value-of select="rss:title"/>
+                  </xsl:element>
+                </li>
+              </xsl:for-each>
+            </ul>
+          </div>
+         
+          </div> <!-- id="body" -->
+
+        <!-- ### Footer ### -->
+          <xsl:comment>
+            <xsl:text> ### Footer ### </xsl:text>
           </xsl:comment>
           <div id="footer">
-            <ul>
-              <li><a href="impressum.html">Impressum</a></li>
-              <li>
-      <!-- 
-        Creative Commons License
-        -->
-                <xsl:comment>
-                  Creative Commons License
-                </xsl:comment>
-                <a rel="license" href="http://creativecommons.org/licenses/by-sa/2.0/de/deed.de">
-                  <img alt="Creative Commons License" src="http://creativecommons.org/images/public/somerights20.gif" title="Creative Commons Attribution-ShareAlike 2.0 Germany License" />
-                </a>
-                <xsl:comment>
-                  &lt;rdf:RDF xmlns="http://web.resource.org/cc/"
-                    xmlns:dc="http://purl.org/dc/elements/1.1/"
-                    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"&gt;
-                    &lt;Work rdf:about=""&gt;
-                      &lt;dc:type rdf:resource="http://purl.org/dc/dcmitype/Interactive" /&gt;
-                      &lt;license rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/de/" /&gt;
-                    &lt;/Work&gt;
-
-                    &lt;License rdf:about="http://creativecommons.org/licenses/by-sa/2.0/de/"&gt;
-                      &lt;permits rdf:resource="http://web.resource.org/cc/Reproduction" /&gt;
-                      &lt;permits rdf:resource="http://web.resource.org/cc/Distribution" /&gt;
-                      &lt;requires rdf:resource="http://web.resource.org/cc/Notice" /&gt;
-                      &lt;requires rdf:resource="http://web.resource.org/cc/Attribution" /&gt;
-                      &lt;permits rdf:resource="http://web.resource.org/cc/DerivativeWorks" /&gt;
-                      &lt;requires rdf:resource="http://web.resource.org/cc/ShareAlike" /&gt;
-                    &lt;/License&gt;
-                  &lt;/rdf:RDF&gt;
-                </xsl:comment>
-              </li>
-              <li>
-                <a href="http://validator.w3.org/check?uri=referer">
-                  <img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0 Strict" />
-                </a>
-              </li>
-            </ul>
+            <xsl:call-template name="footer" />
 <!--          <p id="update">
               <strong>last update:</strong> 02/08/2005 15:15 CEST
             </p> -->
-          </div>
+          </div> <!-- id="footer" -->
           <small class="hidden">
             Cover, Concealment, Camouflage, Denial and Deception
           </small>
-        </div>
-      </body>
-    </xsl:element>
+        </div> <!-- id="page" -->
+      </xsl:element> <!-- name="body" -->
+    </xsl:element> <!-- name="html" -->
   </xsl:template>
 
   <xsl:template match="news">