diff --git a/Makefile b/Makefile
index c6b1a6000..16fdec3a6 100644
--- a/Makefile
+++ b/Makefile
@@ -56,7 +56,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/podcast.xml build/pentaradio.xml build/pentacast.xml build/pentamusic.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)) \
@@ -120,6 +120,11 @@ build/pentacast.xml : NOVALID_IGNORE:=true
 build/pentacast.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
 build/pentacast.xml : PFLAGS+=--stringparam selection pentacast
 build/pentacast.xml: xsl/podcast.xsl # Does not work with $(STYLE) - why?
+build/pentamusic.xml : STYLE=xsl/podcast.xsl
+build/pentamusic.xml : NOVALID_IGNORE:=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?
 
 #.INTERMEDIATE: news.xml
 news.xml: $(NEWSITEMS)
diff --git a/content/navigation.xml b/content/navigation.xml
index 8376ae884..0365079a9 100644
--- a/content/navigation.xml
+++ b/content/navigation.xml
@@ -10,6 +10,7 @@
   <file>events</file>
   <file>radio</file>
   <file>podcast</file>
+  <file>pentamusic</file>
   <file>projekte</file>
   <file>wiki</file>
   <file>muc</file>
diff --git a/content/pages/pentamusic.xml b/content/pages/pentamusic.xml
new file mode 100644
index 000000000..957a3061c
--- /dev/null
+++ b/content/pages/pentamusic.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE page SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
+<?xml-stylesheet type="text/xsl" href="../xsl/html.xsl" ?>
+
+<page title="Musik" pagetitle="(((c3d2))) Pentamusic">
+ <p>
+   Pentamusic ist der Versuch, Künstler, Bands und Labels der CC-Szene
+   vors Mikro zu holen um diese einer breiteren Öffentlichkeit bekannt
+   zu machen.
+ </p>
+ <p>
+   <image title="(((pentacast))" class="right">images/pentacast.png</image>
+
+   Die Feeds der C3D2-News (<link href="news-rss.xml">RSS</link>, <link href="news-atom.xml">ATOM</link>) beinhalten die Mitschnitte als Podcasts.
+
+   Daneben gibt es noch
+   <link href="podcast.xml">Podcast-</link>
+   und <link href="pentamusic.xml">Pentamusic-Feeds</link>, die je
+   nach Verfügbarkeit die MP3-Versionen enthalten.
+ </p>
+
+ <news-list prefix="pentamusic-" details="resources-only"/>
+
+</page>
diff --git a/xsl/podcast.xsl b/xsl/podcast.xsl
index 207a15cd8..a65b63955 100644
--- a/xsl/podcast.xsl
+++ b/xsl/podcast.xsl
@@ -37,6 +37,11 @@
               Pentaradio sind die Sendungen des Chaos Computer Club Dresden auf coloRadio, bestehend aus einem informativen Rahmenprogramm und Beiträgen zu einem sendungsspezifischen Thema.
             </itunes:summary>
             <itunes:image href="{$baseurl}images/pentaradio.png" />
+            <itunes:category text="Society &amp; culture"/>
+            <itunes:category text="Talk">
+              <itunes:category text="Radio"/>
+            </itunes:category>
+            <itunes:category text="Technology"/>
           </xsl:when>
           <xsl:when test="$selection = 'pentacast'">
             <title>Pentacast</title>
@@ -50,6 +55,26 @@
               Computer Club Dresden.
             </itunes:summary>
             <itunes:image href="{$baseurl}images/pentacast.png" />
+            <itunes:category text="Society &amp; culture"/>
+            <itunes:category text="Talk">
+              <itunes:category text="Radio"/>
+            </itunes:category>
+            <itunes:category text="Technology"/>
+          </xsl:when>
+          <xsl:when test="$selection = 'pentamusic'">
+            <title>Pentamusic</title>
+            <link><xsl:value-of select="$baseurl"/>pentamusic.html</link>
+            <description>C3D2 Pentamusic</description>
+            <language>de</language>
+            <copyright>http://creativecommons.org/licenses/by-sa/2.0/de/</copyright>
+            <itunes:subtitle>Musikvorstellungen vom CCC Dresden</itunes:subtitle>
+            <itunes:summary>
+              Versuch, Künstler, Bands und Labels der CC-Szene vors
+              Mikro zu holen um diese einer breiteren Öffentlichkeit
+              bekannt zu machen.
+            </itunes:summary>
+            <itunes:image href="{$baseurl}images/pentacast.png" />
+            <itunes:category text="Music"/>
           </xsl:when>
           <xsl:otherwise>
             <title>C3D2 Podcast</title>
@@ -62,13 +87,13 @@
               Pentaradio &amp; Pentacast vom Chaos Computer Club Dresden.
             </itunes:summary>
             <itunes:image href="{$baseurl}images/pentaradio.png" />
+            <itunes:category text="Society &amp; culture"/>
+            <itunes:category text="Talk">
+              <itunes:category text="Radio"/>
+            </itunes:category>
+            <itunes:category text="Technology"/>
           </xsl:otherwise>
         </xsl:choose>
-        <itunes:category text="Society &amp; culture"/>
-        <itunes:category text="Talk">
-          <itunes:category text="Radio"/>
-        </itunes:category>
-        <itunes:category text="Technology"/>
         <itunes:author>Chaos Computer Club Dresden</itunes:author>
 
         <xsl:for-each select="newsfile">
@@ -90,6 +115,14 @@
                 </xsl:apply-templates>
               </xsl:if>
             </xsl:when>
+            <xsl:when test="$selection = 'pentamusic'">
+              <xsl:if test="starts-with(., 'content/news/pentamusic') and
+                            count(document(.)/item/resource) &gt; 0">
+                <xsl:apply-templates select="document(.)/item/resource" mode="preselect">
+                  <xsl:with-param name="newsfile" select="."/>
+                </xsl:apply-templates>
+              </xsl:if>
+            </xsl:when>
             <xsl:otherwise>
               <xsl:if test="count(document(.)/item/resource) &gt; 0">
                 <xsl:apply-templates select="document(.)/item/resource" mode="preselect">