diff --git a/dspace/src/assemble/assembly-release.xml b/dspace/src/assemble/assembly-release.xml
index 7a4d08acb8..71c1061831 100644
--- a/dspace/src/assemble/assembly-release.xml
+++ b/dspace/src/assemble/assembly-release.xml
@@ -6,7 +6,7 @@
     <format>tar.bz2</format>
   </formats>
   <includeBaseDirectory>true</includeBaseDirectory>
-  <baseDirectory>${artifactId}-${version}-bin</baseDirectory>
+  <baseDirectory>${artifactId}-${version}</baseDirectory>
   <fileSets>
     <fileSet>
       <includes>
diff --git a/dspace/src/assemble/assembly.xml b/dspace/src/assemble/assembly.xml
index c4a44383dd..fa3fc3c24a 100644
--- a/dspace/src/assemble/assembly.xml
+++ b/dspace/src/assemble/assembly.xml
@@ -25,10 +25,15 @@
          <outputDirectory>config</outputDirectory>
          <filtered>true</filtered>
       </file>
-      
    </files>
    
-   <fileSets>   
+   <fileSets> 
+      <fileSet>
+         <directory>${dspace.dir}</directory>
+         <includes>
+            <include>config/dspace.cfg</include>
+         </includes>
+      </fileSet>
       <fileSet>
          <includes>
             <include>bin/**</include>
@@ -59,9 +64,6 @@
          </outputFileNameMapping>
          <unpack>false</unpack>
          <scope>runtime</scope>
-         <excludes>
-            <exclude>junit:junit</exclude>
-         </excludes>
       </dependencySet>
    </dependencySets>