diff --git a/binding-parent/datastore-specific-descriptor/src/main/resources/assemblies/datastore-specific-assembly.xml b/binding-parent/datastore-specific-descriptor/src/main/resources/assemblies/datastore-specific-assembly.xml
index 5783421c..2bf1900f 100644
--- a/binding-parent/datastore-specific-descriptor/src/main/resources/assemblies/datastore-specific-assembly.xml
+++ b/binding-parent/datastore-specific-descriptor/src/main/resources/assemblies/datastore-specific-assembly.xml
@@ -1,77 +1,77 @@
 <!-- 
 Copyright (c) 2015 YCSB contributors. All rights reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License"); you
 may not use this file except in compliance with the License. You
 may obtain a copy of the License at
 
 http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
 implied. See the License for the specific language governing
 permissions and limitations under the License. See accompanying
 LICENSE file.
 -->
 
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" 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>dist</id>
   <includeBaseDirectory>true</includeBaseDirectory>
   <baseDirectory>ycsb-${artifactId}-${version}</baseDirectory>
   <files>
     <file>
       <source>README.md</source>
       <outputDirectory></outputDirectory>
     </file>
   </files>
   <fileSets>
     <fileSet>
       <directory>..</directory>
       <outputDirectory></outputDirectory>
       <fileMode>0644</fileMode>
       <includes>
         <include>LICENSE.txt</include>
         <include>NOTICE.txt</include>
       </includes>
     </fileSet>
     <fileSet>
       <directory>../bin</directory>
       <outputDirectory>bin</outputDirectory>
       <fileMode>0755</fileMode>
       <includes>
-        <include>ycsb</include>
+        <include>ycsb*</include>
       </includes>
     </fileSet>
     <fileSet>
       <directory>../workloads</directory>
       <outputDirectory>workloads</outputDirectory>
       <fileMode>0644</fileMode>
     </fileSet>
     <fileSet>
       <directory>src/main/conf</directory>
       <outputDirectory>conf</outputDirectory>
       <fileMode>0644</fileMode>
     </fileSet>
   </fileSets>
   <dependencySets>
     <dependencySet>
       <outputDirectory>lib</outputDirectory>
       <includes>
         <include>com.yahoo.ycsb:core</include>
       </includes>
       <scope>provided</scope>
       <useTransitiveFiltering>true</useTransitiveFiltering>
     </dependencySet>
     <dependencySet>
       <outputDirectory>lib</outputDirectory>
       <includes>
         <include>*:jar:*</include>
       </includes>
       <excludes>
         <exclude>*:sources</exclude>
       </excludes>
     </dependencySet>
   </dependencySets>
 </assembly>
diff --git a/distribution/src/main/assembly/distribution.xml b/distribution/src/main/assembly/distribution.xml
index 618cee5c..487e1e2d 100644
--- a/distribution/src/main/assembly/distribution.xml
+++ b/distribution/src/main/assembly/distribution.xml
@@ -1,98 +1,98 @@
 <!-- 
 Copyright (c) 2012 - 2015 YCSB contributors. All rights reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License"); you
 may not use this file except in compliance with the License. You
 may obtain a copy of the License at
 
 http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
 implied. See the License for the specific language governing
 permissions and limitations under the License. See accompanying
 LICENSE file.
 -->
 
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" 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>package</id>
   <formats>
     <format>tar.gz</format>
   </formats>
   <includeBaseDirectory>true</includeBaseDirectory>
   <fileSets>
     <fileSet>
       <directory>..</directory>
       <outputDirectory>.</outputDirectory>
       <fileMode>0644</fileMode>
       <includes>
         <include>README</include>
         <include>LICENSE.txt</include>
         <include>NOTICE.txt</include>
       </includes>
     </fileSet>
     <fileSet>
       <directory>../bin</directory>
       <outputDirectory>bin</outputDirectory>
       <fileMode>0755</fileMode>
       <includes>
-        <include>ycsb</include>
+        <include>ycsb*</include>
       </includes>
     </fileSet>
     <fileSet>
       <directory>../workloads</directory>
       <outputDirectory>workloads</outputDirectory>
       <fileMode>0644</fileMode>
     </fileSet>
   </fileSets>
   <dependencySets>
     <dependencySet>
       <outputDirectory>lib</outputDirectory>
       <includes>
         <include>com.yahoo.ycsb:core</include>
       </includes>
       <scope>runtime</scope>
       <useProjectArtifact>false</useProjectArtifact>
       <useProjectAttachments>false</useProjectAttachments>
       <useTransitiveDependencies>true</useTransitiveDependencies>
       <useTransitiveFiltering>true</useTransitiveFiltering>
     </dependencySet>
   </dependencySets>
   <moduleSets>
     <moduleSet>
       <useAllReactorProjects>true</useAllReactorProjects>
       <includeSubModules>true</includeSubModules>
       <excludes>
         <exclude>com.yahoo.ycsb:core</exclude>
         <exclude>com.yahoo.ycsb:binding-parent</exclude>
         <exclude>com.yahoo.ycsb:datastore-specific-descriptor</exclude>
         <exclude>com.yahoo.ycsb:ycsb</exclude>
         <exclude>com.yahoo.ycsb:root</exclude>
       </excludes>
       <sources>
         <fileSets>
           <fileSet>
             <includes>
               <include>README.md</include>
             </includes>
           </fileSet>
           <fileSet>
             <outputDirectory>conf</outputDirectory>
             <directory>src/main/conf</directory>
           </fileSet>
           <fileSet>
             <outputDirectory>lib</outputDirectory>
             <directory>target/dependency</directory>
           </fileSet>
         </fileSets>
       </sources>
       <binaries>
         <includeDependencies>false</includeDependencies>
         <outputDirectory>${module.artifactId}/lib</outputDirectory>
         <unpack>false</unpack>
       </binaries>
     </moduleSet>
   </moduleSets>
 </assembly>