diff --git a/pom.xml b/pom.xml
index c37e6d42e1..55f47feacd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,6 +64,7 @@
 
     <build>
         <finalName>bitsquare</finalName>
+
         <resources>
             <resource>
                 <directory>src/main/java</directory>
@@ -78,6 +79,7 @@
                 <filtering>false</filtering>
             </resource>
         </resources>
+
         <plugins>
 
             <plugin>
@@ -105,10 +107,44 @@
                     </dependency>
                 </dependencies>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.5</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <mainClass>io.bitsquare.BitSquare</mainClass>
+                            <classpathPrefix>dependency-jars/</classpathPrefix>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.8</version>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <includeGroupIds>log4j</includeGroupIds>
+                            <outputDirectory>${project.build.directory}/dependency-jars/</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
         </plugins>
     </build>
 
-
     <dependencies>
         <dependency>
             <groupId>com.google</groupId>
@@ -140,6 +176,7 @@
             <artifactId>logback-core</artifactId>
             <version>1.1.2</version>
         </dependency>
+
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF
deleted file mode 100644
index 83370c8576..0000000000
--- a/src/main/java/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: io.bitsquare.BitSquare
-