diff --git a/README.md b/README.md
index a8ff61e98..74b26537b 100644
--- a/README.md
+++ b/README.md
@@ -60,21 +60,11 @@ mvn -Dmaven.test.skip=true install
 ```
 This will create the jars in the "target" directory of the workspace; this will also skip the unit tests.
 
-To download the dependencies, execute this:
+To package everything up (tarball/zip):
 ```
-mvn dependency:copy-dependencies
+mvn -Dmaven.test.skip=true clean package -P assemble
 ```
-This will download all the dependencies into the "target" directory under "dependency". The next command will package everything up:
-```
-mvn -Dmaven.test.skip=true -Dmaven.buildNumber.doUpdate=false package
-```
-Right now, this will skip the demos directory but I'm working on a fix. The xml nodes to copy the demos are in the
-```
-trunk/src/main/server/assembly/server.xml
-```
-and may be uncommented for a package build, if you have the entire svn tree checked out.
-
-To manually copy the "demos", go to http://red5.googlecode.com/svn/flash/trunk/deploy/ and collect all the files therein. Create a directory in your red5 install at this location 
+To manually copy the "demos" should they not exist in the packages, go to http://red5.googlecode.com/svn/flash/trunk/deploy/ and collect all the files therein. Create a directory in your red5 install at this location 
 ```
 red5/webapps/root/demos
 ```
diff --git a/pom.xml b/pom.xml
index 825df2e71..2013646ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -206,26 +206,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.8</version>
-                <executions>
-                    <execution>
-                        <id>copy-dependencies</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
-                            <overWriteReleases>false</overWriteReleases>
-                            <overWriteSnapshots>false</overWriteSnapshots>
-                            <overWriteIfNewer>true</overWriteIfNewer>
-                            <excludeTransitive>true</excludeTransitive>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
                 <version>2.4</version>
@@ -614,6 +594,25 @@
             <id>assemble</id>
             <build>
                 <plugins>
+                    <plugin>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <version>2.8</version>
+                        <executions>
+                            <execution>
+                                <id>copy-dependencies</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>copy-dependencies</goal>
+                                </goals>
+                                <configuration>
+                                    <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                                    <includeScope>compile</includeScope>
+                                    <excludeScope>test</excludeScope>
+                                    <excludeTransitive>false</excludeTransitive>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>  
                     <plugin>
                         <artifactId>maven-assembly-plugin</artifactId>
                         <version>2.4</version>
@@ -633,7 +632,7 @@
                                 </goals>
                             </execution>
                         </executions>
-                    </plugin>
+                    </plugin>                  
                 </plugins>
             </build>
         </profile>
diff --git a/src/main/assembly/server.xml b/src/main/assembly/server.xml
index 8af210374..e6857f2d6 100644
--- a/src/main/assembly/server.xml
+++ b/src/main/assembly/server.xml
@@ -17,14 +17,7 @@
             <source>${project.build.directory}/lib/red5-service-${red5-service.version}.jar</source>
             <outputDirectory>/</outputDirectory>
             <destName>red5-service.jar</destName>
-        </file>
-<!-- jenkins doesnt like this entry; "dependency" seems useful only to eclipse
-        <file>
-            <source>${project.build.directory}/dependency/red5-service-${project.version}.jar</source>
-            <outputDirectory>/</outputDirectory>
-            <destName>red5-service.jar</destName>
-        </file>
--->
+        </file>        
     </files>	
 	<fileSets>
 		<fileSet>
@@ -41,29 +34,18 @@
 				<include>*.jar</include>
 			</includes>
             <excludes>
-                <exclude>jboss-servlet-api_3.0_spec-1.0.2.Final.jar</exclude>
+                <exclude>jboss-servlet-api_3.0_spec-1.0.2.Final.jar</exclude>               
                 <exclude>antlr-2.7.7.jar</exclude>
+                <exclude>asm-analysis-4.0.jar</exclude>
+                <exclude>asm-commons-4.0.jar</exclude>
+                <exclude>asm-tree-4.0.jar</exclude>
+                <exclude>asm-util-4.0.jar</exclude>
                 <exclude>hamcrest-core-1.1.jar</exclude>
                 <exclude>junit-4.10.jar</exclude>
                 <exclude>groboutils-core-5.jar</exclude>
                 <exclude>red5-service-${red5-service.version}.jar</exclude>
             </excludes>
 		</fileSet>
-		<fileSet>
-			<directory>${project.build.directory}/dependency</directory>
-			<outputDirectory>/lib</outputDirectory>
-			<includes>
-				<include>*.jar</include>
-			</includes>
-			<excludes>
-			    <exclude>jboss-servlet-api_3.0_spec-1.0.2.Final.jar</exclude>
-                <exclude>antlr-2.7.7.jar</exclude>
-                <exclude>hamcrest-core-1.1.jar</exclude>
-                <exclude>junit-4.10.jar</exclude>
-                <exclude>groboutils-core-5.jar</exclude>
-                <exclude>red5-service-${red5-service.version}.jar</exclude>
-			</excludes>
-		</fileSet>
 		<fileSet>
 			<directory>${project.basedir}/src/main/server</directory>
 			<outputDirectory>/</outputDirectory>
@@ -90,6 +72,9 @@
 				<include>*.globals</include>
 				<include>*.jmx</include>
 			</includes>
+            <excludes>
+                <exclude>build_standalone.properties</exclude>       			
+            </excludes>
 		</fileSet>
 		<fileSet>
 			<directory>${project.basedir}/src/main/server/plugins</directory>
@@ -127,10 +112,9 @@
 				<include>*.properties</include>
 			</includes>
 		</fileSet>
-		<!-- Uncomment the next two file sets when creating a tarball / zip -->
-		<!--
+		<!-- Demos -->
 		<fileSet>
-			<directory>../../../flash/trunk/deploy</directory>
+			<directory>${project.basedir}/src/main/server/webapps/root/demos</directory>
 			<outputDirectory>/webapps/root/demos</outputDirectory>
 			<includes>
 				<include>*.html</include>
@@ -141,14 +125,13 @@
 			</includes>
 		</fileSet>
 		<fileSet>
-			<directory>../../../flash/trunk/deploy/assets</directory>
+			<directory>${project.basedir}/src/main/server/webapps/root/demos/assets</directory>
 			<outputDirectory>/webapps/root/demos/assets</outputDirectory>
 			<includes>
 				<include>*.js</include>
 				<include>*.swf</include>
 			</includes>
 		</fileSet>
-		-->
 		<!-- Installer -->
 		<fileSet>
 			<directory>${project.basedir}/src/main/server/webapps/installer</directory>