diff --git a/HISTORY b/HISTORY
index 78b4ad3..bfee9b2 100644
--- a/HISTORY
+++ b/HISTORY
@@ -313,7 +313,7 @@ VDR Plugin 'femon' Revision History
 
 2008-xx-xx: Version 1.6.4
 
-- Added getVideoStream() and getAudioStream() functions.
+- Added getVideoStream()/getAudioStream()/getAC3Stream() functions.
 - Updated Italian translation (Thanks to Diego Pierotto).
 - Fixed a memory leak.
 - Added a check for the minimum OSD height.
diff --git a/femonosd.c b/femonosd.c
index 9b529e0..75d4bab 100644
--- a/femonosd.c
+++ b/femonosd.c
@@ -21,8 +21,8 @@
 #define OSDINFOHEIGHT             (OSDROWHEIGHT * 13)     // in pixels (13 rows)
 #define OSDSTATUSHEIGHT           (OSDROWHEIGHT * 6)      // in pixels (6 rows)
 #define OSDSPACING                5
-#define OSDCORNERING              10
-#define IS_OSDCORNERING           (femonConfig.skin == eFemonSkinElchi)
+#define OSDROUNDING               10
+#define IS_OSDROUNDING            (femonConfig.skin == eFemonSkinElchi)
 
 #define OSDINFOWIN_Y(offset)      (femonConfig.position ? (OSDHEIGHT - OSDINFOHEIGHT + offset) : offset)
 #define OSDINFOWIN_X(col)         ((col == 4) ? 455 : (col == 3) ? 305 : (col == 2) ? 155 : 15)
@@ -65,15 +65,15 @@
         m_Osd->DrawRectangle(0, OSDSTATUSWIN_Y(0), OSDWIDTH, OSDSTATUSWIN_Y(OSDSTATUSHEIGHT), femonTheme[femonConfig.theme].clrBackground); \
         m_Osd->DrawRectangle(0, OSDSTATUSWIN_Y(offset), OSDWIDTH, OSDSTATUSWIN_Y(offset+OSDROWHEIGHT-1), femonTheme[femonConfig.theme].clrTitleBackground); \
         m_Osd->DrawText(OSDSTATUSWIN_X(1), OSDSTATUSWIN_Y(offset), title, femonTheme[femonConfig.theme].clrTitleText, femonTheme[femonConfig.theme].clrTitleBackground, m_Font); \
-        if (IS_OSDCORNERING) { \
-           m_Osd->DrawEllipse(0, OSDSTATUSWIN_Y(0), OSDCORNERING, OSDSTATUSWIN_Y(OSDCORNERING), clrTransparent, -2); \
-           m_Osd->DrawEllipse((OSDWIDTH-OSDCORNERING), OSDSTATUSWIN_Y(0), OSDWIDTH, OSDSTATUSWIN_Y(OSDCORNERING), clrTransparent, -1); \
+        if (IS_OSDROUNDING) { \
+           m_Osd->DrawEllipse(0, OSDSTATUSWIN_Y(0), OSDROUNDING, OSDSTATUSWIN_Y(OSDROUNDING), clrTransparent, -2); \
+           m_Osd->DrawEllipse((OSDWIDTH - OSDROUNDING), OSDSTATUSWIN_Y(0), OSDWIDTH, OSDSTATUSWIN_Y(OSDROUNDING), clrTransparent, -1); \
            }
 
 #define OSDDRAWSTATUSBOTTOMBAR() \
-        if (IS_OSDCORNERING) { \
-           m_Osd->DrawEllipse(0, OSDSTATUSWIN_Y(OSDSTATUSHEIGHT-OSDCORNERING), OSDCORNERING, OSDSTATUSWIN_Y(OSDSTATUSHEIGHT), clrTransparent, -3); \
-           m_Osd->DrawEllipse((OSDWIDTH-OSDCORNERING), OSDSTATUSWIN_Y(OSDSTATUSHEIGHT-OSDCORNERING), OSDWIDTH, OSDSTATUSWIN_Y(OSDSTATUSHEIGHT), clrTransparent, -4); \
+        if (IS_OSDROUNDING) { \
+           m_Osd->DrawEllipse(0, OSDSTATUSWIN_Y(OSDSTATUSHEIGHT - OSDROUNDING), OSDROUNDING, OSDSTATUSWIN_Y(OSDSTATUSHEIGHT), clrTransparent, -3); \
+           m_Osd->DrawEllipse((OSDWIDTH - OSDROUNDING), OSDSTATUSWIN_Y(OSDSTATUSHEIGHT - OSDROUNDING), OSDWIDTH, OSDSTATUSWIN_Y(OSDSTATUSHEIGHT), clrTransparent, -4); \
            }
 
 #define OSDDRAWINFOLEFT(label, value) \
@@ -99,15 +99,15 @@
         m_Osd->DrawRectangle(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), femonTheme[femonConfig.theme].clrBackground); \
         m_Osd->DrawRectangle(0, OSDINFOWIN_Y(offset), OSDWIDTH, OSDINFOWIN_Y(offset + OSDROWHEIGHT - 1), femonTheme[femonConfig.theme].clrTitleBackground); \
         m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), title, femonTheme[femonConfig.theme].clrTitleText, femonTheme[femonConfig.theme].clrTitleBackground, m_Font); \
-        if (IS_OSDCORNERING) { \
-           m_Osd->DrawEllipse(0, OSDINFOWIN_Y(0), OSDCORNERING, OSDINFOWIN_Y(OSDCORNERING), clrTransparent, -2); \
-           m_Osd->DrawEllipse((OSDWIDTH-OSDCORNERING), OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDCORNERING), clrTransparent, -1); \
+        if (IS_OSDROUNDING) { \
+           m_Osd->DrawEllipse(0, OSDINFOWIN_Y(0), OSDROUNDING, OSDINFOWIN_Y(OSDROUNDING), clrTransparent, -2); \
+           m_Osd->DrawEllipse((OSDWIDTH - OSDROUNDING), OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDROUNDING), clrTransparent, -1); \
            }
 
 #define OSDDRAWINFOBOTTOMBAR() \
-        if (IS_OSDCORNERING) { \
-           m_Osd->DrawEllipse(0, OSDINFOWIN_Y(OSDINFOHEIGHT-OSDCORNERING), OSDCORNERING, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent, -3); \
-           m_Osd->DrawEllipse((OSDWIDTH-OSDCORNERING), OSDINFOWIN_Y(OSDINFOHEIGHT-OSDCORNERING), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent, -4); \
+        if (IS_OSDROUNDING) { \
+           m_Osd->DrawEllipse(0, OSDINFOWIN_Y(OSDINFOHEIGHT - OSDROUNDING), OSDROUNDING, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent, -3); \
+           m_Osd->DrawEllipse((OSDWIDTH - OSDROUNDING), OSDINFOWIN_Y(OSDINFOHEIGHT - OSDROUNDING), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent, -4); \
            }
 
 #define OSDCLEARINFO() \
@@ -184,7 +184,7 @@ void cFemonOsd::DrawStatusWindow(void)
   int snr = m_SNR / 655;
   int signal = m_Signal / 655;
   int offset = 0;
-  int x = OSDWIDTH - OSDCORNERING;
+  int x = OSDWIDTH - OSDROUNDING;
   int y = 0;
   eTrackType track = cDevice::PrimaryDevice()->GetCurrentAudioTrack();
   cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
@@ -400,7 +400,7 @@ void cFemonOsd::DrawInfoWindow(void)
             OSDDRAWINFOTITLEBAR(tr("Stream Information"));
             if (m_Receiver && m_Receiver->AC3Valid() && IS_DOLBY_TRACK(track)) {
                offset += OSDROWHEIGHT;
-               OSDDRAWINFOINACTIVE(tr("AC-3 Stream"),            *cString::sprintf("#%d %s", channel->Dpid(int(track - ttDolbyFirst)), channel->Dlang(int(track - ttDolbyFirst))));
+               OSDDRAWINFOACTIVE(  tr("AC-3 Stream"),            *getAC3Stream(track, channel));
                offset += OSDROWHEIGHT;
                OSDDRAWINFOINACTIVE(tr("Bitrate"),                *getAudioBitrate(m_Receiver->AC3Bitrate(), m_Receiver->AC3StreamBitrate()));
                offset += OSDROWHEIGHT;
diff --git a/femontools.c b/femontools.c
index 1001950..028159a 100644
--- a/femontools.c
+++ b/femontools.c
@@ -220,6 +220,20 @@ cString getAudioStream(int value, const cChannel *channel)
   return cString::sprintf("---");
 }
 
+cString getAC3Stream(int value, const cChannel *channel)
+{
+  int pid = 0;
+  if (IS_DOLBY_TRACK(value))
+     pid = int(value - ttDolbyFirst);
+  if (channel && channel->Dpid(pid)) {
+     if (channel->Dlang(pid))
+        return cString::sprintf("#%d (%s)", channel->Dpid(pid), channel->Dlang(pid));
+     else
+        return cString::sprintf("#%d", channel->Dpid(pid));
+     }
+  return cString::sprintf("---");
+}
+
 cString getVideoCodec(int value)
 {
   switch (value) {
diff --git a/femontools.h b/femontools.h
index d4189fd..537c121 100644
--- a/femontools.h
+++ b/femontools.h
@@ -57,6 +57,7 @@ cString getResolution(int width, int height, int scan);
 cString getAspectRatio(int value);
 cString getVideoFormat(int value);
 cString getFrameRate(double value);
+cString getAC3Stream(int value, const cChannel *channel);
 cString getAC3BitStreamMode(int value, int coding);
 cString getAC3AudioCodingMode(int value, int stream);
 cString getAC3CenterMixLevel(int value);