diff --git a/xslfo/datenspuren/schedule/Makefile b/xslfo/datenspuren/schedule/Makefile
index 687139a67..7aaa1baf8 100644
--- a/xslfo/datenspuren/schedule/Makefile
+++ b/xslfo/datenspuren/schedule/Makefile
@@ -1,26 +1,31 @@
-EXPORT_URL=http://www.datenspuren.de/fahrplan/
+EXPORT_DIR=../../../content/static/datenspuren/fahrplan
 FOP=~/programs/fop/fop
+FOP_FLAGS=-d
 XSLT=xsltproc
 XSLT_FLAGS=--novalid
 XEP=~/Java/XEP/xep
 
-KEEP=day_1.de.html day_2.de.html
 
-FOP_FILES=day_1.pdf day_2.pdf
+FOP_FILES=day_2008-06-07.pdf day_2008-06-08.pdf
 XEP_FILES=day_1-xep.pdf day_2-xep.pdf
 
-all: $(FOP_FILES) $(XEP_FILES) $(KEEP)
+all: $(FOP_FILES) #$(XEP_FILES) $(KEEP)
 
-day_%.de.html:
-	wget -O $@ $(EXPORT_URL)/$@
+day_%.de.html: $(EXPORT_DIR)/day_%.de.html
+	cp $< $@
 
-schedule.de.xml:
-	wget -O $@ $(EXPORT_URL)/$@
+schedule.de.xml: $(EXPORT_DIR)/schedule.de.xml
+	cp $< $@
 
 day_%.xml: day_%.de.html day_schedule.xsl schedule.de.xml
 	$(XSLT) $(XSLT_FLAGS) day_schedule.xsl $<|ruby schedule_add_spans.rb > $@
 
-day_%.fo: day_%.xml schedule-fo.xsl
+day_%_hyphenated.xml: day_%.xml
+	sed -e 's/Festplattenverschlüsselung/Festplatten-verschlüsselung/' \
+		-e 's/datenschutzfreundlicher/datenschutz-freundlicher/' \
+		< $< > $@
+
+day_%.fo: day_%_hyphenated.xml schedule-fo.xsl
 	$(XSLT) $(XSLT_FLAGS) -o $@ schedule-fo.xsl $<
 
 day_%-xep.pdf: day_%.fo
diff --git a/xslfo/datenspuren/schedule/schedule-fo.xsl b/xslfo/datenspuren/schedule/schedule-fo.xsl
index 6f26dce20..cab2e62e4 100644
--- a/xslfo/datenspuren/schedule/schedule-fo.xsl
+++ b/xslfo/datenspuren/schedule/schedule-fo.xsl
@@ -25,7 +25,7 @@
     </layout-master-set>
 
     <page-sequence master-reference="FullPage">
-      <flow flow-name="xsl-region-body" font-size="18pt">
+      <flow flow-name="xsl-region-body" font-size="14pt">
 
         <block text-align="right" font-size="8pt">
           Release <xsl:value-of select="@version"/>,
@@ -67,13 +67,13 @@
 </xsl:template>
 
 <xsl:template match="title">
-  <block font-size="36pt" text-align="center" font-weight="bold" margin-top="5mm" margin-bottom="5mm">
+  <block font-size="24pt" text-align="center" font-weight="bold" margin-top="5mm" margin-bottom="5mm">
     <xsl:apply-templates/>
   </block>
 </xsl:template>
 
 <xsl:template match="subtitle">
-  <block font-size="26pt" text-align="center" font-weight="bold" margin-bottom="10mm">
+  <block font-size="20pt" text-align="center" font-weight="bold" margin-bottom="10mm">
     <xsl:apply-templates/>
   </block>
 </xsl:template>
@@ -92,7 +92,7 @@
   <xsl:message>== <xsl:value-of select="$previous-timeslot/@time"/> ++ <xsl:value-of select="@time"/> ==</xsl:message>
   <table-row>
     <table-cell display-align="center">
-      <block text-align="center" font-size="12pt">
+      <block text-align="center" font-size="12pt" padding-bottom="0.5em">
 
         <xsl:variable name="posteventempty">
           <xsl:for-each select="*">
@@ -132,10 +132,10 @@
     <block font-weight="bold">
       <xsl:value-of select="title"/>
     </block>
-    <block font-style="italic" font-size="16pt">
+    <block font-style="italic" font-size="12pt">
       <xsl:value-of select="subtitle"/>
     </block>
-    <block display-align="after" font-size="16pt">
+    <block display-align="after" font-size="14pt">
       <xsl:for-each select="persons/person[string(.) != '&lt;&lt;&lt;/&gt;&gt; Network']">
         <xsl:if test="position() &gt; 1">
           <xsl:text>, </xsl:text>
diff --git a/xslfo/datenspuren/schedule/schedule_add_spans.rb b/xslfo/datenspuren/schedule/schedule_add_spans.rb
index d083b90eb..9450194e9 100644
--- a/xslfo/datenspuren/schedule/schedule_add_spans.rb
+++ b/xslfo/datenspuren/schedule/schedule_add_spans.rb
@@ -29,4 +29,4 @@ matrix.each_element('table/timeslot') { |timeslot|
   }
   $stderr.puts "Stale elements: #{events.inspect}" if events.size > 0
 }
-matrix.write($stdout, 0)
+puts matrix.to_s