diff --git a/Makefile b/Makefile
index 315ea9e98..15074bfa4 100644
--- a/Makefile
+++ b/Makefile
@@ -59,28 +59,22 @@ www: $(XML_CATALOG) $(CONTENT)
 export: www
 	$(RSYNC) $(RSYNC_FLAGS) --exclude=".svn/" www/ $(DESTDIR)/
 
-.SILENT: check
-.PHONY: check
-check: $(PAGES)
-	# XXX
-	for page in $^ ; do \
-	  echo "Checking $${page}..." ; \
-	  $(VALIDATOR) $(VFLAGS) $${page} ; \
-	done
-
 ### Regeln für den XSLT-Prozess ###
 
-build/news.html: $(STYLE)
-build/news-rss.xml: xsl/rss.xsl
-build/news-atom.xml: xsl/atom.xsl
+build/news.html: $(WWW_CCC_DE_UPDATES)
+build/news-rss.xml : STYLE=xsl/rss.xsl
+build/news-atom.xml : STYLE=xsl/atom.xsl
 
-$(NEWSFILES) : STYLE=$(filter-out $(NEWSITEMS) $(NAVIGATION),$^)
 $(NEWSFILES): $(NAVIGATION) $(NEWSITEMS)
 	for item in $(NEWSITEMS) ; do \
 	  $(VALIDATOR) $(VFLAGS) $${item} || exit 1 ; \
 	done
 
 	sh scripts/gen_news.xml.sh $(NEWSITEMS) | $(PROCESSOR) $(PFLAGS) -o $@ $(STYLE) -
+# XXX: only check news.html
+	if [ $(STYLE) = xsl/xhtml.xsl ] ; then \
+		$(VALIDATOR) $(VFLAGS) $@ || { rm $@ ; exit 1 ; } ;\
+	fi
 
 content/datenspuren/schedule.xml: content/static/datenspuren/fahrplan/days.de.html
 	cp $< $@
@@ -88,6 +82,7 @@ content/datenspuren/schedule.xml: content/static/datenspuren/fahrplan/days.de.ht
 build/%.html: content/pages/%.xml $(STYLE) $(NAVIGATION) $(WWW_CCC_DE_UPDATES)
 	$(VALIDATOR) $(VFLAGS) $<
 	$(PROCESSOR) $(PFLAGS) -o $@ $(STYLE) $<
+	$(VALIDATOR) $(VFLAGS) $@ || { rm $@ ; exit 1 ; }
 
 build/datenspuren/%.html: content/datenspuren/%.xml $(DS_STYLE)
         # -- MNE-20060421: Lt. Astro geht Validierung noch nicht mit dem Fahrplan,
@@ -98,6 +93,7 @@ build/datenspuren/%.html: content/datenspuren/%.xml $(DS_STYLE)
 build/news/%.html: content/news/%.xml $(STYLE) $(NAVIGATION) $(WWW_CCC_DE_UPDATES)
 	$(VALIDATOR) $(VFLAGS) $<
 	$(PROCESSOR) $(PFLAGS) -o $@ $(STYLE) $<
+	$(VALIDATOR) $(VFLAGS) $@ || { rm $@ ; exit 1 ; }
 
 dtd/catalog.xml:
 	sh scripts/gen_catalog.xml.sh > $@
diff --git a/content/news/ta-ruby.xml b/content/news/ta-ruby.xml
index e83f916b4..0c44b2ff0 100644
--- a/content/news/ta-ruby.xml
+++ b/content/news/ta-ruby.xml
@@ -3,19 +3,17 @@
 <?xml-stylesheet type="text/xsl" href="../../xsl/html.xsl" ?>
 <item title="TA: Ruby &amp; Ruby on Rails" date="2006-03-19T19:00:00" author="Astro" category="Themenabend">
   <image title="Ruby">ruby.jpg</image>
-  <p>
-    <dl>
-      <dt>Termin</dt>
-      <dd>10. März 2006, 19:00 Uhr</dd>
-      <dt>Ort</dt>
-      <dd>Berufsakademie Dresden, Raum G3, Heideparkstr. 8, 01099 Dresden</dd>
+  <dl>
+    <dt>Termin</dt>
+    <dd>10. März 2006, 19:00 Uhr</dd>
+    <dt>Ort</dt>
+    <dd>Berufsakademie Dresden, Raum G3, Heideparkstr. 8, 01099 Dresden</dd>
 
-      <dt>Themen</dt>
-      <dd>Einführung in Ruby</dd>
-      <dd>Ruby-MediaWiki</dd>
-      <dd>Einführung in Ruby on Rails</dd>
-      <dd>Erstellen eines Wiki mit Rails</dd>
-      <dd>Jabber-Library XMPP4R</dd>
-    </dl>
-  </p>
+    <dt>Themen</dt>
+    <dd>Einführung in Ruby</dd>
+    <dd>Ruby-MediaWiki</dd>
+    <dd>Einführung in Ruby on Rails</dd>
+    <dd>Erstellen eines Wiki mit Rails</dd>
+    <dd>Jabber-Library XMPP4R</dd>
+  </dl>
 </item>
diff --git a/dtd/c3d2web.dtd b/dtd/c3d2web.dtd
index ed1bca641..e75d9d037 100644
--- a/dtd/c3d2web.dtd
+++ b/dtd/c3d2web.dtd
@@ -1,9 +1,10 @@
 <!ENTITY % URI "CDATA">
     <!-- a Uniform Resource Identifier, see [RFC2396] -->
 
-<!ENTITY % Inline "(#PCDATA | link | pre | em | dl | image )*">
+<!ENTITY % Inline "(#PCDATA | link | em | image )*">
+<!ENTITY % Block "p|pre|dl|ul|ol">
 
-<!ELEMENT page ((news)|(p|pre|dl|ul|ol)+)>
+<!ELEMENT page ((news)|(%Block;)*)>
 <!ATTLIST page
   title     CDATA   #IMPLIED
   pagetitle CDATA   #IMPLIED
@@ -12,7 +13,7 @@
 <!ELEMENT news (newsfile)+>
 <!ELEMENT newsfile (#PCDATA)>
 
-<!ELEMENT item ((image)?, (p|pre|addendum)+)>
+<!ELEMENT item ((image)?, (%Block;)*, (addendum)?)>
 <!ATTLIST item
   title     CDATA   #REQUIRED
   date      CDATA   #REQUIRED
@@ -20,7 +21,7 @@
   category  CDATA   #REQUIRED
   >
 
-<!ELEMENT addendum (p|pre|dl|ul|ol)*>
+<!ELEMENT addendum (%Block;)*>
 
 <!ELEMENT p %Inline;>
 <!ATTLIST p
diff --git a/xsl/xhtml.xsl b/xsl/xhtml.xsl
index 49bbf0f44..58ae66fb2 100644
--- a/xsl/xhtml.xsl
+++ b/xsl/xhtml.xsl
@@ -95,6 +95,7 @@
             <p>
               <input type="text" name="phrase" size="20" value="c3d2" />
               <input type="submit" name="submit" value="Suchen!" />
+              <a href="/cgi-bin/estseek.cgi"><small>Hilfe</small></a>
             </p>
           </form>