diff --git a/de/share/sgml/header.l10n.ent b/de/share/sgml/header.l10n.ent
index 372b98681b..34e5d43cf1 100644
--- a/de/share/sgml/header.l10n.ent
+++ b/de/share/sgml/header.l10n.ent
@@ -1,56 +1,106 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $FreeBSD$
-     $FreeBSDde: de-www/share/sgml/header.l10n.ent,v 1.4 2007/02/16 16:25:04 jkois Exp $
+     $FreeBSDde: de-www/share/sgml/header.l10n.ent,v 1.5 2007/02/17 18:35:51 jkois Exp $
      basiert auf: 1.6
  -->
 
 <!-- Components making up the standard headers and footers. -->
 <!-- Override in the prolog <em>before</em> including this  -->
 <!-- file if necessary.-->
 <!ENTITY copyright '<a href="&enbase;/search/index-site.html">Sitemap</a> | <a href="&enbase;/copyright/">Legal Notices</a> | &copy; 1995-2007 The FreeBSD Project.  Alle Rechte vorbehalten.'>
 <!ENTITY author '<a href="&base;/index.html">Startseite</a> &nbsp; | &nbsp;
   <a href="&base;/mailto.html">Ansprechpartner</a> &nbsp; | &nbsp;
   <a href="&enbase;/copyright/index.html">Legal</a> &nbsp; | &nbsp;
   &copyright;'>
 
 <!-- Standard headers and footers -->
 
 <!ENTITY header2.word.search 'Suche'>
 <!ENTITY header2.word.textsize 'Schriftgr&ouml;&szlig;e'>
 <!ENTITY header2.word.normaltextsize 'Normale Schrift'>
 <!ENTITY header2.word.largetextsize 'Gro&szlig;e Schrift'>
 <!ENTITY header2.word.normal 'Normal'>
 <!ENTITY header2.word.large 'Gro&szlig;'>
 <!ENTITY header2.word.donate 'Spenden'>
 <!ENTITY header2.word.contact 'Kontakt'>
 
 <!ENTITY header2.topnav '
   <h2 class="blockhide">Site Navigation</h2>
 
   <div id="TOPNAV">
     <ul id="TOPNAVLIST">
       <li><a href="&base;/" title="Startseite">Startseite</a></li>
       <li><a href="&base;/about.html" title="&Uuml;ber FreeBSD">Info</a></li>
       <li><a href="&base;/where.html" title="FreeBSD Bezugsquellen">Bezugsquellen</a></li>
       <li><a href="&base;/docs.html" title="Dokumentation">Dokumentation</a></li>
       <li><a href="&base;/community.html" title="Community">Community</a></li>
       <li><a href="&enbase;/projects/index.html" title="Entwicklung">Entwicklung</a></li>
       <li><a href="&base;/support.html" title="Hilfe">Hilfe</a></li>
       <li><a href="http://www.freebsdfoundation.org/" title="The FreeBSD Foundation">Foundation</a></li>
     </ul>
   </div> <!-- TOPNAV -->
 '>
 
+<!ENTITY header2 '
+<span class="txtoffscreen"
+><a href="#CONTENT" title="Skip site navigation" accesskey="1"
+>Skip site navigation</a> (1)
+<a href="#CONTENTWRAP" title="Skip section navigation" accesskey="2"
+>Skip section navigation</a> (2)</span>
+
+<div id="HEADERCONTAINER">
+  <div id="HEADER">
+    <h2 class="blockhide">Header und Logo</h2>
+
+    <div id="HEADERLOGOLEFT">
+      &header2.logo-red;
+    </div> <!-- HEADERLOGOLEFT -->
+
+    <div id="HEADERLOGORIGHT">
+      <h2 class="blockhide">Externe Links</h2>
+
+      <div id="SEARCHNAV">
+        <ul id="SEARCHNAVLIST">
+          <li>&header2.word.textsize;: <a href="#" onkeypress="return false;"
+              onclick="setActiveStyleSheet(&#39;Normal Text&#39;); return false;"
+              title="&header2.word.normaltextsize;">&header2.word.normal;</a>
+              /
+              <a href="#" onkeypress="return false;"
+              onclick="setActiveStyleSheet(&#39;Large Text&#39;); return false;"
+              title="&header2.word.largetextsize;">&header2.word.large;</a></li>
+
+          <li><a href="&enbase;/donations/" title="&header2.word.donate;">&header2.word.donate;</a></li>
+
+          <li class="last-child"><a href="&base;/mailto.html" title="&header2.word.contact;">&header2.word.contact;</a></li>
+        </ul>
+      </div> <!-- SEARCHNAV -->
+
+      <div id="SEARCH">
+        <form action="&cgibase;/search.cgi" method="get">
+          <div>
+            <h2 class="blockhide"><label for="WORDS">&header2.word.search;</label></h2>
+
+            &header2.searchinputs;
+          </div>
+        </form>
+      </div> <!-- SEARCH -->
+    </div> <!-- HEADERLOGORIGHT -->
+  </div> <!-- HEADER -->
+
+  &header2.topnav;
+</div> <!-- HEADERCONTAINER -->
+'>
+
 <!-- macro for webbuild paper -->
 <!ENTITY webbuild '
 <p>Dieses Dokument beschreibt, wie man die FreeBSD Webseiten von Hand
 mittels des CVS Repository aktualisiert und &uuml;bersetzt.</p>'>
 
 <!--
      Local Variables:
      mode: sgml
      sgml-indent-data: t
      sgml-omittag: nil
      sgml-always-quote-attributes: t
      End:
 -->
diff --git a/de/share/sgml/navibar.l10n.ent b/de/share/sgml/navibar.l10n.ent
index b4bf85e095..39a7605a6f 100644
--- a/de/share/sgml/navibar.l10n.ent
+++ b/de/share/sgml/navibar.l10n.ent
@@ -1,132 +1,132 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!--
   $FreeBSD$
-  $FreeBSDde: de-www/share/sgml/navibar.l10n.ent,v 1.3 2007/01/14 16:42:42 jkois Exp $
+  $FreeBSDde: de-www/share/sgml/navibar.l10n.ent,v 1.4 2007/02/17 17:51:08 jkois Exp $
   basiert auf: 1.5
 -->
 
 <!ENTITY % navinclude.about "IGNORE">
 <![ %navinclude.about; [
 <!ENTITY nav '<div id="SIDENAV">
 <h2 class="blockhide">Navigation-Men&uuml;</h2>
 <ul>
 <li><a href="&base;/about.html">&#220;ber FreeBSD</a></li>
 <li><a href="&base;/features.html">Eigenschaften</a></li>
 <li><a href="&base;/applications.html">Anwendungen</a></li>
 <li><a href="&base;/internet.html">Netzwerkfunktionen</a></li>
-<li><a href="&base;/../advocacy/">FreeBSD bewerben</a></li>
-<li><a href="&base;/../marketing/">Marketing</a></li>
+<li><a href="&enbase;/advocacy/">FreeBSD bewerben</a></li>
+<li><a href="&enbase;/marketing/">Marketing</a></li>
 <li><a href="&base;/news/newsflash.html">Neuigkeiten</a></li>
-<li><a href="&base;/../events/events.html">Veranstaltungen</a></li>
+<li><a href="&enbase;/events/events.html">Veranstaltungen</a></li>
 <li><a href="&base;/news/press.html">Aus der Presse</a></li>
-<li><a href="&base;/../art.html">Kunst</a></li>
-<li><a href="&base;/../logo.html">Logo</a></li>
-<li><a href="&base;/../donations/">Spenden</a></li>
-<li><a href="&base;/../copyright/">Rechtliches</a></li>
+<li><a href="&enbase;/art.html">Kunst</a></li>
+<li><a href="&enbase;/logo.html">Logo</a></li>
+<li><a href="&enbase;/donations/">Spenden</a></li>
+<li><a href="&enbase;/copyright/">Rechtliches</a></li>
 </ul>
 </div> <!-- SIDENAV -->'>
 ]]>
 
 <!ENTITY % navinclude.community "IGNORE">
 <![ %navinclude.community; [
 <!ENTITY nav '<div id="SIDENAV">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/community.html">Community</a></li>
 <li><a href="&base;/community/mailinglists.html">Mailinglisten</a></li>
 <li><a href="&base;/community/irc.html">IRC</a></li>
 <li><a href="&base;/community/newsgroups.html">Newsgroups</a></li>
 <li><a href="&enbase;/usergroups.html">Anwendergruppen</a></li>
 <li><a href="&base;/community/webresources.html">Internetressourcen</a></li>
 </ul>
 </div> <!-- SIDENAV -->'>
 ]]>
 
 <!ENTITY % navinclude.developers "IGNORE">
 <![ %navinclude.developers; [
 <!ENTITY nav '<div id="SIDENAV">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
-<li><a href="&base;/../projects/index.html">Entwicklung</a></li>
-<li><a href="&base;/../doc/en_US.ISO8859-1/books/developers-handbook">Developer&#39;s Handbook</a></li>
-<li><a href="&base;/../doc/en_US.ISO8859-1/books/porters-handbook">Porter&#39;s Handbook</a></li>
-<li><a href="&base;/../developers/cvs.html">CVS Repository</a></li>
-<li><a href="&base;/../releng/index.html">Release Engineering</a></li>
+<li><a href="&enbase;/projects/index.html">Entwicklung</a></li>
+<li><a href="&enbase;/doc/en_US.ISO8859-1/books/developers-handbook">Developer&#39;s Handbook</a></li>
+<li><a href="&enbase;/doc/en_US.ISO8859-1/books/porters-handbook">Porter&#39;s Handbook</a></li>
+<li><a href="&enbase;/developers/cvs.html">CVS Repository</a></li>
+<li><a href="&enbase;/releng/index.html">Release Engineering</a></li>
 <li><a href="&base;/platforms/">Plattformen</a></li>
-<li><a href="&base;/../projects/ideas/">Projektvorschl&auml;ge</a></li>
-<li><a href="&base;/../doc/&url.doc.langcode;/articles/contributing/index.html">FreeBSD unterst&uuml;tzen</a></li>
+<li><a href="&enbase;/projects/ideas/">Projektvorschl&auml;ge</a></li>
+<li><a href="&enbase;/doc/&url.doc.langcode;/articles/contributing/index.html">FreeBSD unterst&uuml;tzen</a></li>
 </ul>
 </div> <!-- SIDENAV -->'>
 ]]>
 
 <!ENTITY % navinclude.docs "IGNORE">
 <![ %navinclude.docs; [
 <!ENTITY nav '<div id="SIDENAV">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/docs.html">Dokumentation</a></li>
 <li><a href="&enbase;/doc/&url.doc.langcode;/books/faq/">FAQ</a></li>
 <li><a href="&enbase;/doc/&url.doc.langcode;/books/handbook/">Handbuch</a></li>
 <li><a href="&base;/docs/man.html">Manual-Pages</a>
 	<ul>
 		<li><a href="&cgibase;/man.cgi">Manual-Pages (Online)</a></li>
 	</ul>
 </li>
 <li><a href="&base;/docs/books.html">B&uuml;cher und Artikel (Online)</a></li>
 <li><a href="&enbase;/publish.html">Publikationen</a></li>
 <li><a href="&base;/docs/webresources.html">Internet-Ressourcen</a></li>
 <li><a href="&base;/projects/newbies.html">F&uuml;r Einsteiger</a></li>
 <li><a href="&base;/docproj/">Documentation Project</a></li>
 </ul>
 </div> <!-- SIDENAV -->'>
 ]]>
 
 <!ENTITY % navinclude.download "IGNORE">
 <![ %navinclude.download; [
 <!ENTITY nav '<div id="SIDENAV">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/where.html">FreeBSD Bezugsquellen</a></li>
 <li><a href="&base;/releases/">Release Informationen</a>
 	<ul>
 		<li><a href="&u.rel.announce;">Produktivversion: &rel.current;</a></li>
 		<li><a href="&u.rel2.announce;">Alte Produktivversion: &rel2.current;</a></li>
-		<li><a href="&base;/../snapshots/">Snapshot Releases</a></li>
+		<li><a href="&enbase;/snapshots/">Snapshot Releases</a></li>
 	      <![ %beta.testing; [
 		<li><a href="&u.betarel.schedule;">Testversion: &betarel.current;</a></li>
               ]]>
 	      <![ %beta2.testing; [
                 <li><a href="&u.betarel2.schedule;">Testversion: &betarel2.current;</a></li>
               ]]>
 	</ul>
 </li>
 <li><a href="&enbase;/ports/">Anwendungen (Ports)</a></li>
 </ul>
 </div> <!-- SIDENAV -->'>
 ]]>
 
 <!ENTITY % navinclude.support "IGNORE">
 <![ %navinclude.support; [
 <!ENTITY nav '<div id="SIDENAV">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/support.html">Hilfe</a></li>
 <li><a href="&enbase;/commercial/">Anbieter</a>
 	<ul>
 		<li><a href="&enbase;/commercial/software_bycat.html">Software</a></li>
 		<li><a href="&enbase;/commercial/hardware.html">Hardware</a></li>
 		<li><a href="&enbase;/commercial/consult_bycat.html">Beratung</a></li>
 		<li><a href="&enbase;/commercial/isp.html">Internet Service Provider</a></li>
 		<li><a href="&enbase;/commercial/misc.html">Verschiedenes</a></li>
 	</ul>
 </li>
 <li><a href="&base;/security/">Sicherheit</a></li>
 <li><a href="&base;/support/bugreports.html">Fehlerberichte</a>
 	<ul>
 		<li><a href="&base;/send-pr.html">Einreichen</a></li>
 	</ul>
 </li>
 <li><a href="&base;/support/webresources.html">Internet-Ressourcen</a></li>
 </ul>
 </div> <!-- SIDENAV -->'>
 ]]>