diff --git a/Makefile b/Makefile
index 99838ce87..a146c327b 100644
--- a/Makefile
+++ b/Makefile
@@ -128,29 +128,29 @@ build/news-atom.xml build/news-archiv-atom.xml : PFLAGS+=--stringparam prefix ""
 build/news-atom.xml build/news-archiv-atom.xml : VFLAGS_OUT=$(VFLAGS) --relaxng xsd/atom.rng
 build/podcast.xml build/podcast-archiv.xml : STYLE=xsl/podcast.xsl
 build/podcast.xml build/podcast-archiv.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
-build/podcast.xml build/podcast-archiv.xml : PFLAGS+=--stringparam format audio/mpeg
+build/podcast.xml build/podcast-archiv.xml : PFLAGS+=--stringparam format audio/mpeg,video/mp4
 build/podcast.xml build/podcast-archiv.xml: xsl/podcast.xsl # Does not work with $(STYLE) - why?
 build/pentaradio.xml build/pentaradio-archiv.xml : STYLE=xsl/podcast.xsl
 build/pentaradio.xml build/pentaradio-archiv.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
-build/pentaradio.xml build/pentaradio-archiv.xml : PFLAGS+=--stringparam selection pentaradio --stringparam format audio/mpeg
+build/pentaradio.xml build/pentaradio-archiv.xml : PFLAGS+=--stringparam selection pentaradio --stringparam format audio/mpeg,video/mp4
 build/pentaradio.xml build/pentaradio-archiv.xml: xsl/podcast.xsl # Does not work with $(STYLE) - why?
 build/pentacast.xml build/pentacast-archiv.xml : STYLE=xsl/podcast.xsl
 build/pentacast.xml build/pentacast-archiv.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
-build/pentacast.xml build/pentacast-archiv.xml : PFLAGS+=--stringparam selection pentacast --stringparam format audio/mpeg
+build/pentacast.xml build/pentacast-archiv.xml : PFLAGS+=--stringparam selection pentacast --stringparam format audio/mpeg,video/mp4
 build/pentacast.xml build/pentacast-archiv.xml: xsl/podcast.xsl # Does not work with $(STYLE) - why?
 
 build/pentacast-ogg.xml build/pentacast-ogg-archiv.xml : STYLE=xsl/podcast.xsl
 build/pentacast-ogg.xml build/pentacast-ogg-archiv.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
-build/pentacast-ogg.xml build/pentacast-ogg-archiv.xml : PFLAGS+=--stringparam selection pentacast --stringparam format audio/ogg
+build/pentacast-ogg.xml build/pentacast-ogg-archiv.xml : PFLAGS+=--stringparam selection pentacast --stringparam format audio/ogg,video/ogg,application/ogg,video/webm
 build/pentacast-ogg.xml build/pentacast-ogg-archiv.xml : xsl/podcast.xsl # Does not work with $(STYLE) - why?
 
 build/pentamusic.xml build/pentamusic-archiv.xml : STYLE=xsl/podcast.xsl
 build/pentamusic.xml build/pentamusic-archiv.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
-build/pentamusic.xml build/pentamusic-archiv.xml : PFLAGS+=--stringparam selection pentamusic --stringparam format audio/mpeg
+build/pentamusic.xml build/pentamusic-archiv.xml : PFLAGS+=--stringparam selection pentamusic --stringparam format audio/mpeg,video/mp4
 build/pentamusic.xml build/pentamusic-archiv.xml: xsl/podcast.xsl # Does not work with $(STYLE) - why?
 build/pentamedia.xml build/pentamedia-archiv.xml : STYLE=xsl/podcast.xsl
 build/pentamedia.xml build/pentamedia-archiv.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
-build/pentamedia.xml build/pentamedia-archiv.xml : PFLAGS+=--stringparam selection pentamedia --stringparam format audio/mpeg
+build/pentamedia.xml build/pentamedia-archiv.xml : PFLAGS+=--stringparam selection pentamedia --stringparam format audio/mpeg,video/mp4
 build/pentamedia.xml build/pentamedia-archiv.xml: xsl/podcast.xsl # Does not work with $(STYLE) - why?
 
 #.INTERMEDIATE: news.xml
diff --git a/xsl/podcast.xsl b/xsl/podcast.xsl
index 9a3e42396..5dec955dd 100644
--- a/xsl/podcast.xsl
+++ b/xsl/podcast.xsl
@@ -191,8 +191,8 @@
 
     <xsl:choose>
       <!-- Gibts ein $format? -->
-      <xsl:when test="count(alternative[@type=$format]) &gt; 0">
-        <xsl:apply-templates select="alternative[@type=$format]">
+      <xsl:when test="count(alternative[contains($format, @type)]) &gt; 0">
+        <xsl:apply-templates select="alternative[contains($format, @type)]">
           <xsl:with-param name="newsfile" select="$newsfile"/>
         </xsl:apply-templates>
       </xsl:when>