diff --git a/nbbuild.xml b/nbbuild.xml
index e22a6f1..02bec01 100644
--- a/nbbuild.xml
+++ b/nbbuild.xml
@@ -70,4 +70,34 @@
     nbproject/build-impl.xml file. 
 
     -->
+
+        <target name="-post-jar">
+            
+            <!-- Create ZIP file for the web client -->
+            <zip destfile="${dist.dir}/console.zip" basedir="webclient"/>
+
+            <!-- Create ZIP file for the demo player -->
+            <zip destfile="${dist.dir}/player-demo.zip" basedir="player-demo"/>
+
+            <!-- Copy sample configuration file -->
+            <copy file="server.properties.sample" todir="${dist.dir}"/>
+
+            <!-- Copy GPL license file -->
+            <copy file="GPL.txt" todir="${dist.dir}"/>
+
+            <!-- Copy README file -->
+            <copy file="README.md" todir="${dist.dir}"/>
+            
+            <!-- Copy README file also as .txt (and overwrite Netbeans's default) -->
+            <copy file="README.md" tofile="${dist.dir}/README.txt"/>
+            
+        </target>
+        
+        <target name="package" depends="jar">
+            <tstamp>
+                <format property="current-time" pattern="yyyyMMdd-hhmm"/>
+            </tstamp>
+            
+            <zip destfile="${dist.dir}/stream-m-${current-time}.zip" basedir="${dist.dir}"/>
+        </target>
 </project>
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index d879e72..d810dba 100644
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -127,6 +127,7 @@ is divided into following sections:
         </condition>
         <condition property="have.sources">
             <or>
+                <available file="${src.player-demo.dir}"/>
                 <available file="${src.webclient.dir}"/>
                 <available file="${src.dir}"/>
             </or>
@@ -224,6 +225,7 @@ is divided into following sections:
         <!-- You can override this target in the ../build.xml file. -->
     </target>
     <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
+        <fail unless="src.player-demo.dir">Must set src.player-demo.dir</fail>
         <fail unless="src.webclient.dir">Must set src.webclient.dir</fail>
         <fail unless="src.dir">Must set src.dir</fail>
         <fail unless="test.test.dir">Must set test.test.dir</fail>
@@ -247,7 +249,7 @@ is divided into following sections:
     </target>
     <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.webclient.dir}:${src.dir}" name="srcdir"/>
+            <attribute default="${src.player-demo.dir}:${src.webclient.dir}:${src.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <attribute default="${javac.processorpath}" name="processorpath"/>
@@ -288,7 +290,7 @@ is divided into following sections:
     </target>
     <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.webclient.dir}:${src.dir}" name="srcdir"/>
+            <attribute default="${src.player-demo.dir}:${src.webclient.dir}:${src.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <attribute default="${javac.processorpath}" name="processorpath"/>
@@ -321,7 +323,7 @@ is divided into following sections:
     </target>
     <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
         <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.webclient.dir}:${src.dir}" name="srcdir"/>
+            <attribute default="${src.player-demo.dir}:${src.webclient.dir}:${src.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <sequential>
@@ -919,11 +921,12 @@ is divided into following sections:
                 <include name="*"/>
             </dirset>
         </pathconvert>
-        <j2seproject3:depend srcdir="${src.webclient.dir}:${src.dir}:${build.generated.subdirs}"/>
+        <j2seproject3:depend srcdir="${src.player-demo.dir}:${src.webclient.dir}:${src.dir}:${build.generated.subdirs}"/>
     </target>
     <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
         <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
         <copy todir="${build.classes.dir}">
+            <fileset dir="${src.player-demo.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.webclient.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
@@ -946,7 +949,7 @@ is divided into following sections:
     <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
         <j2seproject3:force-recompile/>
-        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.webclient.dir}:${src.dir}"/>
+        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.player-demo.dir}:${src.webclient.dir}:${src.dir}"/>
     </target>
     <target name="-post-compile-single">
         <!-- Empty placeholder for easier customization. -->
@@ -1212,6 +1215,9 @@ is divided into following sections:
             <classpath>
                 <path path="${javac.classpath}"/>
             </classpath>
+            <fileset dir="${src.player-demo.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
+                <filename name="**/*.java"/>
+            </fileset>
             <fileset dir="${src.webclient.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
@@ -1225,6 +1231,9 @@ is divided into following sections:
             <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>
         </javadoc>
         <copy todir="${dist.javadoc.dir}">
+            <fileset dir="${src.player-demo.dir}" excludes="${excludes}" includes="${includes}">
+                <filename name="**/doc-files/**"/>
+            </fileset>
             <fileset dir="${src.webclient.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/doc-files/**"/>
             </fileset>
diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index d1686b9..296d690 100644
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-nbbuild.xml.data.CRC32=63a84e25
+nbbuild.xml.data.CRC32=a9afa406
 nbbuild.xml.script.CRC32=1dc2e3b8
 nbbuild.xml.stylesheet.CRC32=8064a381@1.75.1.48
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=63a84e25
-nbproject/build-impl.xml.script.CRC32=b58f6545
+nbproject/build-impl.xml.data.CRC32=a9afa406
+nbproject/build-impl.xml.script.CRC32=709b109c
 nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.1.48
diff --git a/nbproject/project.properties b/nbproject/project.properties
index a3b0ec8..c4d5b4a 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -94,5 +94,6 @@ run.test.classpath=\
     ${build.test.classes.dir}
 source.encoding=UTF-8
 src.dir=${file.reference.stream-m-src}
+src.player-demo.dir=player-demo
 src.webclient.dir=webclient
 test.test.dir=test
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 610e8fa..87d7b93 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -5,6 +5,7 @@
         <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
             <name>Stream-m</name>
             <source-roots>
+                <root id="src.player-demo.dir"/>
                 <root id="src.webclient.dir"/>
                 <root id="src.dir"/>
             </source-roots>