diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index e5d88dd..c0e54e9 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -41,6 +41,7 @@ Rolf Ahrenberg
   for suggesting increased thread priorities for cStreamdevWriter/Streamer
   for adding "Hide mainmenu entry" option
   for polishing po file headers
+  for adding the special meaning "show current channel" to channel 0
 
 Rantanen Teemu
   for providing vdr-incompletesections.diff
diff --git a/HISTORY b/HISTORY
index 16f73ae..dbaa4f9 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,8 @@
 VDR Plugin 'streamdev' Revision History
 ---------------------------------------
  
+- New special meaning "show current channel" when channel 0 is requested.
+  Applies to HTTP streaming only (thanks to Rolf Ahrenberg)
 - Added streamdev-client support for upcoming streamdev-server versions
   with purely priority driven precedence.
 - API change of VDR 1.7.26: "avoid device" is no longer available
diff --git a/README b/README
index 27d9ea3..13501d4 100644
--- a/README
+++ b/README
@@ -231,8 +231,10 @@ streams directly like this:
   http://hostname:3000/S19.2E-0-12480-898
 
 The first one will deliver a channel by number on the server, the second one
-will request the channel by unique channel id. In addition, you can specify 
-the desired stream type as a path to the channel.
+will request the channel by unique channel id. Use the special channel number 0
+to see the server's current live TV channel.
+
+In addition, you can specify the desired stream type as a path to the channel.
 
   http://hostname:3000/TS/3
   http://hostname:3000/PES/S19.2E-0-12480-898
diff --git a/server/connection.c b/server/connection.c
index ced28e1..212483c 100644
--- a/server/connection.c
+++ b/server/connection.c
@@ -111,6 +111,8 @@ const cChannel* cServerConnection::ChannelFromString(const char *String, int *Ap
 
 	if (isnumber(string)) {
 		int temp = strtol(String, NULL, 10);
+		if (temp == 0)
+			temp = cDevice::CurrentChannel();
 		if (temp >= 1 && temp <= Channels.MaxNumber())
 			channel = Channels.GetByNumber(temp);
 	} else {