diff --git a/HISTORY b/HISTORY
index 0836178..38246d4 100644
--- a/HISTORY
+++ b/HISTORY
@@ -100,3 +100,7 @@ VDR Plugin 'iptv' Revision History
 - Added a note about recommended frequencies into README.
 - Fixed a locking bug with section filters.
 - Fixed some lint warnings.
+
+2009-xx-xx: Version 0.3.0
+
+- Added iptvstream-notrap.sh script.
diff --git a/README b/README
index cebfac7..c2cb7a3 100644
--- a/README
+++ b/README
@@ -171,6 +171,10 @@ Notes:
   difference of 4 or greater. It's recommended to use frequencies in decades
   (10, 20, 30, 40, ...) for all IPTV channel entries.
 
+- VLC processes won't get killed on some setups with the provided iptvstream.sh
+  script and the iptvstream-notrap.sh script should be used instead in these
+  cases.
+
 Acknowledgements:
 
 - The IPTV section filtering code is derived from Linux kernel.
diff --git a/iptv.c b/iptv.c
index 767001c..bd1efde 100644
--- a/iptv.c
+++ b/iptv.c
@@ -20,7 +20,7 @@
 #error "VDR-1.6.0 API version or greater is required!"
 #endif
 
-static const char VERSION[]     = "0.2.6";
+static const char VERSION[]     = "0.3.0";
 static const char DESCRIPTION[] = trNOOP("Experience the IPTV");
 
 class cPluginIptv : public cPlugin {
diff --git a/iptv/iptvstream-notrap.sh b/iptv/iptvstream-notrap.sh
new file mode 100755
index 0000000..3ec440f
--- /dev/null
+++ b/iptv/iptvstream-notrap.sh
@@ -0,0 +1,76 @@
+#!/bin/sh
+#
+# iptvstream.sh can be used by the VDR iptv plugin to transcode external
+# sources
+#
+# (C) 2007 Rolf Ahrenberg, Antti Seppälä
+#
+# iptvstream.sh is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This package is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this package; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
+
+if [ $# -ne 2 ]; then
+    logger "$0: error: Invalid parameter count '$#' $*"
+    exit 1
+fi
+
+# Channels.conf parameter
+PARAMETER=${1}
+
+# Iptv plugin listens this port
+PORT=${2}
+
+# Default settings for stream transcoding
+VCODEC=mp2v
+VBITRATE=2400
+ACODEC=mpga
+ABITRATE=320
+
+# There is a way to specify multiple URLs in the same script. The selection is
+# then controlled by the extra parameter passed by IPTV plugin to the script
+case ${PARAMETER} in
+    1)
+        URL=""
+        WIDTH=720
+        HEIGHT=576
+        ;;
+    2)
+        URL=""
+        ;;
+    3)
+        URL=""
+        ;;
+    *)
+        URL=""  # Default URL
+        ;;
+esac
+
+if [ -z "${URL}" ]; then
+    logger "$0: error: URL not defined!"
+    exit 1
+fi
+
+# Create transcoding options
+TRANSCODE_OPTS="vcodec=${VCODEC},acodec=${ACODEC},vb=${VBITRATE},ab=${ABITRATE}"
+if [ -n "${WIDTH}" -a -n "${HEIGHT}" ] ; then
+    TRANSCODE_OPTS="${TRANSCODE_OPTS},width=${WIDTH},height=${HEIGHT}"
+fi
+
+# Create unique pids for the stream
+let VPID=${PARAMETER}+1
+let APID=${PARAMETER}+2
+let SPID=${PARAMETER}+3
+
+# Execute VLC
+exec vlc "${URL}" --sout "#transcode{${TRANSCODE_OPTS}}:standard{access=udp,mux=ts{pid-video=${VPID},pid-audio=${APID},pid-spu=${SPID}},dst=127.0.0.1:${PORT}}" --intf dummy