diff --git a/Makefile b/Makefile
index 1a39fa863..1ac769466 100644
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,7 @@ PAGES:=$(patsubst content/pages/%.xml, build/%.html, $(wildcard content/pages/*.
 NEWS_PAGES:=$(patsubst content/news/%.xml, build/news/%.html, $(wildcard content/news/*.xml))
 # News-Index und Feeds:
 NEWSFILES:=build/news.html build/news-rss.xml build/news-atom.xml \
-	build/podcast.xml build/pentaradio.xml build/pentacast.xml build/pentamusic.xml \
+	build/podcast.xml build/pentaradio.xml build/pentacast.xml build/pentamusic.xml build/pentamedia.xml \
 	build/ical.ics build/xcal.xml build/reminders build/datenspuren/news-rss.xml build/datenspuren/news-atom.xml
 PLAYLISTS:=$(patsubst content/news/pentaradio%.xml, build/news/pentaradio%.xspf, $(wildcard content/news/pentaradio*.xml)) \
 	$(patsubst content/news/pentaradio%.xml, build/news/pentaradio%.pls, $(wildcard content/news/pentaradio*.xml)) \
@@ -132,6 +132,11 @@ build/pentamusic.xml : NOVALID:=true
 build/pentamusic.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
 build/pentamusic.xml : PFLAGS+=--stringparam selection pentamusic
 build/pentamusic.xml: xsl/podcast.xsl # Does not work with $(STYLE) - why?
+build/pentamedia.xml : STYLE=xsl/podcast.xsl
+build/pentamedia.xml : NOVALID:=true
+build/pentamedia.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
+build/pentamedia.xml : PFLAGS+=--stringparam selection pentamedia
+build/pentamedia.xml: xsl/podcast.xsl # Does not work with $(STYLE) - why?
 
 #.INTERMEDIATE: news.xml
 news.xml: $(NEWSITEMS)
diff --git a/xsl/podcast.xsl b/xsl/podcast.xsl
index f9683ded7..ff68682d6 100644
--- a/xsl/podcast.xsl
+++ b/xsl/podcast.xsl
@@ -26,7 +26,7 @@
       <xsl:message>selection: '<xsl:value-of select="$selection"/>'</xsl:message>
       <channel>
         <xsl:choose>
-          <xsl:when test="$selection = 'pentaradio'">
+          <xsl:when test="$selection = 'pentaradio' or $selection = 'pentamedia'">
             <title>Pentaradio</title>
             <link><xsl:value-of select="$baseurl"/>radio.html</link>
             <description>C3D2 Pentaradio</description>
@@ -43,7 +43,7 @@
             </itunes:category>
             <itunes:category text="Technology"/>
           </xsl:when>
-          <xsl:when test="$selection = 'pentacast'">
+          <xsl:when test="$selection = 'pentacast' or $selection = 'pentamedia'">
             <title>Pentacast</title>
             <link><xsl:value-of select="$baseurl"/>podcast.html</link>
             <description>C3D2 Pentacast</description>
@@ -61,7 +61,7 @@
             </itunes:category>
             <itunes:category text="Technology"/>
           </xsl:when>
-          <xsl:when test="$selection = 'pentamusic'">
+          <xsl:when test="$selection = 'pentamusic' or $selection = 'pentamedia'">
             <title>Pentamusic</title>
             <link><xsl:value-of select="$baseurl"/>pentamusic.html</link>
             <description>C3D2 Pentamusic</description>
@@ -103,7 +103,7 @@
         <xsl:for-each select="newsfile">
           <xsl:sort select="date:seconds(document(.)/item/@date)" data-type="number" order="descending" />
           <xsl:choose>
-            <xsl:when test="$selection = 'pentaradio'">
+            <xsl:when test="$selection = 'pentaradio' or $selection = 'pentamedia'">
               <xsl:if test="starts-with(., 'content/news/pentaradio') and
                             count(document(.)/item/resource) &gt; 0">
                 <xsl:apply-templates select="document(.)/item/resource" mode="preselect">
@@ -111,7 +111,7 @@
                 </xsl:apply-templates>
               </xsl:if>
             </xsl:when>
-            <xsl:when test="$selection = 'pentacast'">
+            <xsl:when test="$selection = 'pentacast' or $selection = 'pentamedia'">
               <xsl:if test="starts-with(., 'content/news/pentacast') and
                             count(document(.)/item/resource) &gt; 0">
                 <xsl:apply-templates select="document(.)/item/resource" mode="preselect">
@@ -119,7 +119,7 @@
                 </xsl:apply-templates>
               </xsl:if>
             </xsl:when>
-            <xsl:when test="$selection = 'pentamusic'">
+            <xsl:when test="$selection = 'pentamusic' or $selection = 'pentamedia'">
               <xsl:if test="starts-with(., 'content/news/pentamusic') and
                             count(document(.)/item/resource) &gt; 0">
                 <xsl:apply-templates select="document(.)/item/resource" mode="preselect">