diff --git a/Makefile b/Makefile
index 1ac769466..091f19220 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,7 @@ DS_SCHEDULE=$(wildcard content/static/datenspuren/fahrplan/day/*.html)
 DATESTAMP=build/.stamp-$(shell date +%Y-%m-%d)
 
 # Dateinamen der zu erzeugenden html-Dateien:
-CONTENT=$(PAGES) $(NEWS_PAGES) $(DS_PAGES) $(NEWSFILES) $(SEARCH_TMPL) build/calendar.html
+CONTENT=$(PAGES) $(NEWS_PAGES) $(DS_PAGES) $(NEWSFILES) build/calendar.html
 
 # 'normale' Seiten:
 PAGES:=$(patsubst content/pages/%.xml, build/%.html, $(wildcard content/pages/*.xml))
@@ -65,8 +65,6 @@ PLAYLISTS:=$(patsubst content/news/pentaradio%.xml, build/news/pentaradio%.xspf,
 	$(patsubst content/news/pentaradio%.xml, build/news/pentaradio%.m3u, $(wildcard content/news/pentaradio*.xml))
 # Datenspuren-Seiten:
 DS_PAGES:=$(patsubst content/datenspuren/%.xml, build/datenspuren/%.html, $(wildcard content/datenspuren/*.xml))
-# Suchseiten-Template
-SEARCH_TMPL:=build/cgi-bin/search.html
 
 # Quellen
 NEWSITEMS:=$(wildcard content/news/*.xml)
@@ -192,11 +190,6 @@ build/news/%.html : BASEURL="../"
 build/news/%.html: content/news/%.xml $(STYLE) $(NAVIGATION) $(WWW_CCC_DE_UPDATES) $(CALENDAR_SUMMARY) $(DATESTAMP)
 	$(call xml_process)
 
-# Suche:
-build/cgi-bin/search.html : BASEURL="../"
-build/cgi-bin/search.html: content/cgi-bin/search.xml $(STYLE) $(NAVIGATION) $(DATESTAMP)
-	$(call xml_process)
-
 build/datenspuren/%html : STYLE=$(DS_STYLE)
 build/datenspuren/%.html: content/datenspuren/%.xml $(DS_STYLE) news.xml $(DS_SCHEDULE)
 	$(call xml_process)
diff --git a/content/static/style/default.css b/content/static/style/default.css
index e0d8903fe..0a6031396 100644
--- a/content/static/style/default.css
+++ b/content/static/style/default.css
@@ -70,23 +70,13 @@ pre {
   background: url(../images/ck.png) top center no-repeat;
 }
 
-#navigation form {
-  padding: 0.2em 0 0.2em 0;
-  margin: 1em 0.3em 0 0.3em;
-  border-top: #ebc63c 1px solid;
-  border-bottom: #ebc63c 1px solid;
-  text-align: center;
-}
-
-#navigation input[type =text] {
-  width: 80%;
-} 
-
 #navigation ul {
   list-style-type: square;
   list-style-image: url(../images/bullet.png);
   font-size: small;
   padding-left: 2em;
+  padding-top: 0.2em;
+  border-top: #ebc63c 1px solid;
 }
 
 #navigation li {
@@ -599,170 +589,6 @@ li audio, li video, li .poster {
     font-weight: bold;
 }
 
-/* -- Search Engine -- */
-div.search div.estform {
-  margin: 0.8em 1.0em; padding: 0em 1.0em;
-  background: #eeeeff none; border: solid 1pt #bbbbcc;
-  -moz-border-radius: 0.4em;
-}
-div.search div.form_basic {
-  margin: 0.4em 0em 0em 0em; padding: 0em 0em;
-  font-size: smaller;
-}
-div.search div.form_extension {
-  margin: 0.3em 0em 0.3em 0em; padding: 0em 0em;
-  font-size: smaller;
-}
-div.search div.estresult {
-  text-align: left;
-  margin: 1.0em 1.0em; padding: 0em 0em;
-}
-div.search div.resinfo {
-  text-align: right;
-  font-size: smaller;
-}
-div.search div.hints {
-  margin-right: 0.8em; text-align: right;
-  font-size: smaller; color: #555555;
-}
-div.search div.relkeys {
-  margin-right: 0.3em; text-align: right;
-  font-size: smaller; color: #555555;
-  opacity: 0.70;
-}
-div.search div.relkeys a {
-  color: #007777; text-decoration: none;
-}
-div.search div.relkeys a:hover {
-  color: #0066dd; text-decoration: underline;
-}
-div.search dl.doc {
-  margin: 1.3em 0em;
-}
-div.search dl.doc dd {
-  font-size: smaller; color: #222222;
-}
-div.search a.doc_title {
-  color: #0011ee; text-decoration: underline;
-}
-div.search a.doc_title:hover {
-  color: #0033ff; text-decoration: underline;
-}
-div.search span.doc_score {
-  font-size: smaller; color: #555555;
-}
-div.search span.doc_score:before {
-  content: "(";
-}
-div.search span.doc_score:after {
-  content: ")";
-}
-div.search span.doc_link {
-  color: #007744;
-}
-div.search dd.doc_attr {
-  margin: 0em 0.8em;
-}
-div.search span.doc_val {
-  color: #111111;
-}
-div.search dd.doc_text {
-  margin: 0em 1.3em;
-}
-div.search strong.key {
-  margin: 0em -0.1em; padding: 0em 0.1em;
-  color: #000011;
-  -moz-border-radius: 0.3em;
-}
-div.search strong.key1 { background-color: #ffffcc; }
-div.search strong.key2 { background-color: #ffeeee; }
-div.search strong.key3 { background-color: #eeeeff; }
-div.search strong.key4 { background-color: #eeffdd; }
-div.search code.delim { color: #555555; letter-spacing: -0.1em; }
-div.search dd.doc_navi {
-  margin: 0em 1.1em;
-}
-div.search div.doc_clip {
-  margin-left: 2.5em; margin-top: -0.6em;
-}
-div.search div.doc_clip p {
-  font-size: smaller; color: #444444;
-}
-div.search a.detail,a.similar,a.include {
-  color: #007777; text-decoration: none;
-}
-div.search a.detail:hover,a.similar:hover,a.include:hover {
-  color: #0066dd; text-decoration: underline;
-}
-div.search p.note {
-  margin: 3em 1.5em;
-  color: #444444;
-}
-div.search div.paging {
-  margin: 2em 1em; text-align: right;
-  font-size: smaller;
-}
-div.search a.navi {
-  margin: 0em 0.2em; padding: 0em 0.5em;
-  background: #eeeeff none; border: solid 1pt #bbbbcc;
-  -moz-border-radius: 0.25em;
-  color: #0022aa; text-decoration: none;
-}
-div.search span.void {
-  margin: 0em 0.2em; padding: 0em 0.5em;
-  background: #eeeeee none; border: solid 1pt #bbbbcc;
-  -moz-border-radius: 0.25em;
-  color: #aaaaaa;
-  opacity: 0.70;
-}
-div.search a.pnum {
-  margin: 0em 0em; padding: 0em 0.2em;
-  background: #eeeeff none; border: solid 1pt #bbbbcc;
-  -moz-border-radius: 0.25em;
-  font-size: smaller; color: #0022aa; text-decoration: none;
-}
-div.search span.pnow {
-  margin: 0em 0em; padding: 0em 0.2em;
-  background: #ffeedd none; border: solid 1pt #bbbbcc;
-  -moz-border-radius: 0.25em;
-}
-div.search div.estinfo {
-  margin: 1.5em 1.0em; padding: 0em 0em; text-align: right;
-  font-size: smaller; color: #555555;
-  opacity: 0.80;
-}
-div.search div.estinfo a {
-  color: #555555; text-decoration: none;
-}
-div.search div.logo {
-  margin: 4.0em 1em; text-align: center;
-}
-div.search div.logo h1 {
-  color: #000000;
-}
-div.search div.logo div.caption {
-  margin-top: -0.9em;
-  color: #222222;
-}
-div.search div.help {
-  margin: 2em 4em; padding: 2em 2em;
-  background-color: #eeeeff; border: 2pt solid #ddddee;
-  -moz-border-radius: 0.8em;
-}
-div.search div.help h2 {
-  margin-top: 1.2em;
-}
-div.search div.help p {
-  line-height: 145%; text-indent: 0.8em;
-}
-div.search div.help pre {
-  margin: 0em 2em; padding: 0em 0.2em;
-  background-color: #ffffff; border: 1pt solid #999999;
-  -moz-border-radius: 0.2em;
-}
-input#phrase {
-  width: 50%;
-}
 p.blockquote {
         padding: .5em .5em .5em 2em;
         border-left: 20px solid #eee;
diff --git a/xsl/xhtml5.xsl b/xsl/xhtml5.xsl
index a636defbf..1927e14db 100644
--- a/xsl/xhtml5.xsl
+++ b/xsl/xhtml5.xsl
@@ -55,8 +55,6 @@
   <xsl:template name="body">
     <xsl:param name="title" />
 
-    <xsl:variable name="issearchpage" select="$title = 'Suche'" />
-
     <xsl:element name="html">
       <xsl:attribute name="lang">de</xsl:attribute>
       <xsl:attribute name="xml:lang">de</xsl:attribute>
@@ -85,24 +83,7 @@
 	      <xsl:text> ### Navigation ### </xsl:text>
 	    </xsl:comment>
 	    <nav id="navigation">
-
-	      <xsl:if test="not($issearchpage)">
-		<!-- ### Search ### -->
-		<xsl:comment>
-		  <xsl:text> ### Search ### </xsl:text>
-		</xsl:comment>
-
-		<form action="/cgi-bin/estseek.cgi" method="get">
-		  <p>
-		    <input type="text" name="phrase" size="20" value="c3d2" />
-		    <input type="submit" name="submit" value="Suchen!" />
-		    <a href="{$baseurl}cgi-bin/estseek.cgi"><small>Hilfe</small></a>
-		  </p>
-		</form>
-	      </xsl:if>
-
 	      <xsl:call-template name="navitems" />
-
 	    </nav>
 
 
@@ -122,49 +103,34 @@
             <xsl:text> ### Content ### </xsl:text>
           </xsl:comment>
 
-          <xsl:choose>
-            <xsl:when test="$issearchpage">
-              <section id="content" class="search">
-                <h2>Suche</h2>
-                <xsl:comment>ESTFORM</xsl:comment>
-                <xsl:comment>ESTRESULT</xsl:comment>
-                <xsl:comment>ESTINFO</xsl:comment>
-		
-		<xsl:call-template name="footer" />
-              </section> <!-- class="search" -->
-            </xsl:when>
-            <xsl:otherwise> <!-- normale Seite -->
-              <section id="content">
-                <xsl:if test="event">
-                  <xsl:attribute name="class">vevent</xsl:attribute>
-                </xsl:if>
+	  <section id="content">
+	    <xsl:if test="event">
+	      <xsl:attribute name="class">vevent</xsl:attribute>
+	    </xsl:if>
 
-                <h2>
-                  <xsl:if test="name(.) = 'item'">
-                    <xsl:attribute name="class">news</xsl:attribute>
-                  </xsl:if>
+	    <h2>
+	      <xsl:if test="name(.) = 'item'">
+		<xsl:attribute name="class">news</xsl:attribute>
+	      </xsl:if>
 
-                  <xsl:value-of select="$title" />
-                </h2>
+	      <xsl:value-of select="$title" />
+	    </h2>
 
-                <!-- Für Seiten, die nur ein Newsitem beinhalten,
-                     Newsmetadaten anzeigen
-                 -->
-                <xsl:if test="name(.) = 'item'">
-                  <xsl:call-template name="news-meta"/>
-                </xsl:if>
+	    <!-- Für Seiten, die nur ein Newsitem beinhalten,
+		 Newsmetadaten anzeigen
+	    -->
+	    <xsl:if test="name(.) = 'item'">
+	      <xsl:call-template name="news-meta"/>
+	    </xsl:if>
 
-                <xsl:apply-templates/>
+	    <xsl:apply-templates/>
 
-                <xsl:call-template name="include-resources">
-                  <xsl:with-param name="include-hidden">yes</xsl:with-param>
-                </xsl:call-template>
-              </section> <!-- id="content" -->
-
-	      <xsl:call-template name="footer" />
-            </xsl:otherwise>
-          </xsl:choose>
+	    <xsl:call-template name="include-resources">
+	      <xsl:with-param name="include-hidden">yes</xsl:with-param>
+	    </xsl:call-template>
+	  </section> <!-- id="content" -->
 
+	  <xsl:call-template name="footer" />
           </div> <!-- id="body" -->
         </div> <!-- id="page" -->
       </xsl:element> <!-- name="body" -->