diff --git a/test/rtmp-publisher/README.md b/test/rtmp-publisher/README.md
index d0ff69d..c31a2ac 100644
--- a/test/rtmp-publisher/README.md
+++ b/test/rtmp-publisher/README.md
@@ -2,7 +2,7 @@
 
 Simple RTMP publisher.
 
-Edit the following flashvars in demo.html to suite your needs.
+Edit the following flashvars in publisher.html & player.html to suite your needs.
 
 streamer: RTMP endpoint
 file: live stream name
@@ -12,3 +12,4 @@ file: live stream name
 Install flex sdk http://www.adobe.com/devnet/flex/flex-sdk-download.html
 
     mxmlc RtmpPublisher.mxml
+    mxmlc RtmpPlayer.mxml
diff --git a/test/rtmp-publisher/RtmpPlayer.mxml b/test/rtmp-publisher/RtmpPlayer.mxml
new file mode 100644
index 0000000..f874394
--- /dev/null
+++ b/test/rtmp-publisher/RtmpPlayer.mxml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<s:Application xmlns:fx="http://ns.adobe.com/mxml/2009"
+         xmlns:s="library://ns.adobe.com/flex/spark"
+         xmlns:mx="library://ns.adobe.com/flex/mx"
+         minWidth="500" minHeight="350" creationComplete="init()">
+
+  <fx:Declarations>
+    <!-- Place non-visual elements (e.g., services, value objects) here -->
+  </fx:Declarations>
+
+  <fx:Script>
+    <![CDATA[
+      import mx.controls.Alert;
+      import mx.core.FlexGlobals;
+      private var streamer:String;
+      private var file:String;
+
+      private function toggleFeedListener(event:MouseEvent):void {
+        if(toggleFeed.label == 'Start Feed') {
+          toggleFeed.label = 'Stop Feed';
+          toggleAudio.enabled = true;
+          videoDisplay.play();
+        } else {
+          toggleFeed.label = 'Start Feed';
+          toggleAudio.enabled = false;
+          videoDisplay.close();
+        }
+      }
+
+      private function toggleAudioHandler(event:MouseEvent):void {
+        if(toggleAudio.label == 'Unmute') {
+          toggleAudio.label = 'Mute';
+          videoDisplay.volume = 1;
+        } else {
+          toggleAudio.label = 'Unmute';
+          videoDisplay.volume = 0;
+        }
+      }
+
+      private function initListeners():void {
+        toggleFeed.addEventListener(MouseEvent.CLICK, toggleFeedListener);
+        toggleAudio.addEventListener(MouseEvent.CLICK, toggleAudioHandler);
+      }
+
+      private function init():void {
+        streamer = FlexGlobals.topLevelApplication.parameters.streamer;
+        file = FlexGlobals.topLevelApplication.parameters.file;
+        if(file == null) {
+          Alert.show('Missing flashvars: file');
+          return;
+        }
+        if(streamer == null) {
+          Alert.show('Missing flashvars: streamer');
+          return;
+        }
+        videoDisplay.source = streamer + "/" + file;
+        initListeners();
+      }
+    ]]>
+  </fx:Script>
+  <s:Panel x="0" y="0" width="100%" height="100%" title="RTMP Player">
+    <mx:VideoDisplay width="100%" height="100%" id="videoDisplay" autoPlay="false">
+    </mx:VideoDisplay>
+    <s:controlBarContent>
+      <s:Button label="Start Feed" id="toggleFeed"></s:Button>
+      <s:Spacer width="100%" height="100%"/>
+      <s:Button label="Mute" id="toggleAudio" enabled="false"></s:Button>
+    </s:controlBarContent>
+  </s:Panel>
+</s:Application>
diff --git a/test/rtmp-publisher/RtmpPlayer.swf b/test/rtmp-publisher/RtmpPlayer.swf
new file mode 100644
index 0000000..a8aa285
Binary files /dev/null and b/test/rtmp-publisher/RtmpPlayer.swf differ
diff --git a/test/rtmp-publisher/RtmpPublisher.swf b/test/rtmp-publisher/RtmpPublisher.swf
index 325a233..a3396cf 100644
Binary files a/test/rtmp-publisher/RtmpPublisher.swf and b/test/rtmp-publisher/RtmpPublisher.swf differ
diff --git a/test/rtmp-publisher/player.html b/test/rtmp-publisher/player.html
new file mode 100644
index 0000000..5a2a2d8
--- /dev/null
+++ b/test/rtmp-publisher/player.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>RTMP Player</title>
+    <script type="text/javascript" src="swfobject.js"></script>
+    <script type="text/javascript">
+        var flashVars = {
+            streamer: 'rtmp://localhost/myapp',
+            file:'mystream'
+        };
+        swfobject.embedSWF("RtmpPlayer.swf", "rtmp-publisher", "500", "400", "9.0.0", null, flashVars);
+    </script>
+</head>
+<body>
+    <div id="rtmp-publisher">
+        <p>Flash not installed</p>
+    </div>
+</body>
+</html>
diff --git a/test/rtmp-publisher/demo.html b/test/rtmp-publisher/publisher.html
similarity index 100%
rename from test/rtmp-publisher/demo.html
rename to test/rtmp-publisher/publisher.html
