diff --git a/build.xml b/build.xml
index cd6e219cc0f2eef5abbae24ad343cfffc5c6e753..f79911e953b0d7628f07e1f5709f9a245c5e782b 100644
--- a/build.xml
+++ b/build.xml
@@ -75,7 +75,7 @@
         <property name="store.jar" value="${dist.dir}/${store.jar.name}.jar"/>
         <echo message="Packaging ${application.title} into a single JAR at ${store.jar}"/>
         <jar destfile="${store.jar}" filesetmanifest="skip">
-            <zipgroupfileset dir="${dist.dir}" includes="*.jar"/>
+            <zipgroupfileset dir="${dist.dir}" includes="${store.jar}"/>
             <zipgroupfileset dir="${dist.dir}/lib" includes="*.jar"/>
             <manifest>
                 <attribute name="Main-Class" value="${main.class}"/>
diff --git a/nbproject/project.properties b/nbproject/project.properties
index ad7b8e357b29942866fb054527b46b7fd9c9548b..353b7fe5e8e77b96b2b75f759165c9f6fbafe1d1 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -25,7 +25,7 @@ debug.test.classpath=\
 dist.archive.excludes=
 # This directory is removed when the project is cleaned:
 dist.dir=dist
-dist.jar=${dist.dir}/LiFiBenchMarkingNetwork.jar
+dist.jar=${dist.dir}/${application.title}.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=