diff --git a/examples/bin/run_example_server.sh b/examples/bin/run_example_server.sh
index bc7da9269dc..f012d7d0503 100755
--- a/examples/bin/run_example_server.sh
+++ b/examples/bin/run_example_server.sh
@@ -55,6 +55,7 @@ JAVA_ARGS="${JAVA_ARGS} -Ddruid.realtime.specFile=${SPEC_FILE}"
 DRUID_CP=${EXAMPLE_LOC}
 DRUID_CP=${DRUID_CP}:../config
 DRUID_CP=${DRUID_CP}:`ls ../target/druid-examples-*-selfcontained.jar`
+DRUID_CP=${DRUID_CP}:`ls ./lib/druid-examples-*-selfcontained.jar`
 
 echo "Running command:"
 
diff --git a/services/pom.xml b/services/pom.xml
index 3926cbe986a..2ac0e7ac9d7 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -63,7 +63,6 @@
                     </execution>
                 </executions>
             </plugin>
-<!--
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <executions>
@@ -81,7 +80,6 @@
                     </execution>
                 </executions>
             </plugin>
--->
         </plugins>
     </build>
 </project>
diff --git a/services/src/assembly/assembly.xml b/services/src/assembly/assembly.xml
index 967ed9b2614..6e0b675801d 100644
--- a/services/src/assembly/assembly.xml
+++ b/services/src/assembly/assembly.xml
@@ -2,20 +2,49 @@
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
     <id>bin</id>
-    <formats>
-        <format>dir</format>
-    </formats>
-    <includeBaseDirectory>false</includeBaseDirectory>
+        <formats>
+            <format>tar.gz</format>
+        </formats>
     <fileSets>
         <fileSet>
-            <directory>src/bin</directory>
+            <directory>../examples/config</directory>
             <includes>
-                <include>*.sh</include>
+                <include>*</include>
             </includes>
-            <fileMode>0644</fileMode>
+            <outputDirectory>config</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>/</directory>
+            <directory>../examples/bin</directory>
+            <includes>
+                <include>*sh</include>
+            </includes>
+            <fileMode>744</fileMode>
+            <outputDirectory>/</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../examples/target</directory>
+            <includes>
+                <include>druid-examples-*-selfcontained.jar</include>
+            </includes>
+            <outputDirectory>lib</outputDirectory>
+        </fileSet>
+	<fileSet>
+            <directory>../examples/bin/examples</directory>
+            <includes>
+                <include>**</include>
+            </includes>
+            <outputDirectory>examples</outputDirectory>
+        </fileSet>
+	<fileSet>
+            <directory>../examples/bin/examples/twitter</directory>
+            <includes>
+                <include>*sh</include>
+            </includes>
+            <fileMode>744</fileMode>
+            <outputDirectory>examples/twitter</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../</directory>
             <includes>
                 <include>LICENSE</include>
             </includes>
@@ -25,7 +54,7 @@
         <dependencySet>
             <useProjectArtifact>true</useProjectArtifact>
             <useTransitiveDependencies>true</useTransitiveDependencies>
-            <outputDirectory>lib/</outputDirectory>
+            <outputDirectory>lib</outputDirectory>
         </dependencySet>
     </dependencySets>
-</assembly>
\ No newline at end of file
+</assembly>