diff --git a/.travis.yml b/.travis.yml
index edbde07..5e5f5ec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,6 +19,7 @@ deploy:
   provider: releases
   file:
   - esteid.jar
+  - esteid-app.jar
   skip_cleanup: true
   on:
     tags: true
diff --git a/Manifest.mf b/Manifest.mf
index eb98f2d..4043a1e 100644
--- a/Manifest.mf
+++ b/Manifest.mf
@@ -1,3 +1,6 @@
 Manifest-Version: 1.0
-Main-Class: org.esteid.hacker.CLI
-Class-Path: lib/bcpkix-jdk15on-154.jar lib/bcprov-jdk15on-154.jar lib/jopt-simple-4.9.jar lib/apdu4j-pcsc.jar lib/gp.jar lib/vjcre.jar
+Premain-Class: Capsule
+Main-Class: Capsule
+Application-ID: org.esteid.hacker
+Application-Class: org.esteid.hacker.CLI
+Min-Java-Version: 1.8.0
diff --git a/build.xml b/build.xml
index 33b5f8a..146c2d4 100644
--- a/build.xml
+++ b/build.xml
@@ -56,11 +56,15 @@
   <!-- Package it into a nice little JAR -->
   <target name="dist" depends="compile" description="generate the distribution">
     <exec command="git describe --always --tags" output="build/org/esteid/version.txt"/>
-    <jar manifest="Manifest.mf" destfile="esteid.jar" level="9" basedir="build">
+    <jar destfile="esteid.jar" level="9" basedir="build">
       <fileset dir="src">
         <include name="resources/*.pem"/>
       </fileset>
     </jar>
+    <copy file="esteid.jar" todir="capsule"/>
+    <jar manifest="Manifest.mf" destfile="esteid-app.jar" level="9" basedir="capsule">
+       <fileset dir="lib"><include name="*.jar"/></fileset>
+    </jar>
   </target>
   <target name="cmd" depends="compile" description="generate the local commandline utility">
     <jar manifest="Manifest.mf" destfile="esteid.jar" level="9" basedir="build">
diff --git a/capsule/Capsule.class b/capsule/Capsule.class
new file mode 100644
index 0000000..d621b54
Binary files /dev/null and b/capsule/Capsule.class differ