diff --git a/pom.xml b/pom.xml
index 91cf1ff2..6a853a95 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,6 +108,14 @@
     </dependencies>
 
     <build>
+       <resources>
+           <resource>
+               <directory>src/main/resources</directory>
+           </resource>
+           <resource>
+               <directory>src/main/javahelp</directory>
+           </resource>
+       </resources>
        <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -118,6 +126,40 @@
                     <target>1.7</target>
                 </configuration>
             </plugin>
+           <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-jar-plugin</artifactId>
+               <version>2.6</version>
+               <configuration>
+                   <finalName>jmeld</finalName>
+                   <archive>
+                       <manifest>
+                           <addClasspath>true</addClasspath>
+                           <classpathPrefix>lib/</classpathPrefix>
+                           <mainClass>org.jmeld.JMeld</mainClass>
+                       </manifest>
+                   </archive>
+               </configuration>
+           </plugin>
+           <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-assembly-plugin</artifactId>
+               <version>2.6</version>
+               <configuration>
+                   <descriptors>
+                       <descriptor>src/main/assembly/dist.xml</descriptor>
+                   </descriptors>
+               </configuration>
+               <executions>
+                   <execution>
+                       <id>create-assembly</id>
+                       <phase>package</phase>
+                       <goals>
+                           <goal>single</goal>
+                       </goals>
+                   </execution>
+               </executions>
+           </plugin>
         </plugins>
     </build>
 </project>
diff --git a/src/main/assembly/dist.xml b/src/main/assembly/dist.xml
new file mode 100644
index 00000000..85790804
--- /dev/null
+++ b/src/main/assembly/dist.xml
@@ -0,0 +1,28 @@
+<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>bin</id>
+    <formats>
+        <format>tar.gz</format>
+        <format>zip</format>
+    </formats>
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>lib</outputDirectory>
+            <scope>runtime</scope>
+        </dependencySet>
+    </dependencySets>
+    <fileSets>
+        <fileSet>
+            <directory>${project.basedir}/src/main/scripts</directory>
+            <outputDirectory>/</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>jmeld*.jar</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+</assembly>
\ No newline at end of file
diff --git a/src/main/scripts/jmeld b/src/main/scripts/jmeld
index 0d7ae4e3..e5ade0c2 100755
--- a/src/main/scripts/jmeld
+++ b/src/main/scripts/jmeld
@@ -1,4 +1,4 @@
 #!/bin/sh
-
-java -Xmx400m -Dfile.encoding=windows-1252 -classpath /home/alberto/projects/java/jmeld/target/classes:/home/alberto/.m2/repository/javax/activation/activation/1.1.1/activation-1.1.1.jar:/home/alberto/.m2/repository/jgoodies/forms/1.0.5/forms-1.0.5.jar:/home/alberto/.m2/repository/com/jgoodies/looks/2.2.1/looks-2.2.1.jar:/home/alberto/.m2/repository/org/mod4j/com/ibm/icu/4.0.1/icu-4.0.1.jar:/home/alberto/.m2/repository/com/sun/woodstock/dependlibs/jhall/2.0/jhall-2.0.jar:/home/alberto/.m2/repository/eu/medsea/mimeutil/mime-util/2.1.3/mime-util-2.1.3.jar:/home/alberto/.m2/repository/org/slf4j/slf4j-api/1.5.6/slf4j-api-1.5.6.jar:/home/alberto/.m2/repository/org/slf4j/slf4j-log4j12/1.5.6/slf4j-log4j12-1.5.6.jar:/home/alberto/.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar:/home/alberto/.m2/repository/com/l2fprod/common/7.3/common-7.3.jar:/home/alberto/.m2/repository/javax/xml/bind/jaxb-api/2.2.6/jaxb-api-2.2.6.jar:/home/alberto/.m2/repository/com/sun/xml/bind/jaxb-impl/2.2.4/jaxb-impl-2.2.4.jar:/home/alberto/.m2/repository/javax/xml/jsr173/1.0/jsr173-1.0.jar:/home/alberto/.m2/repository/com/jidesoft/jide-oss/2.9.7/jide-oss-2.9.7.jar:/home/alberto/.m2/repository/org/swinglabs/swing-layout/1.0.3/swing-layout-1.0.3.jar:/home/alberto/.m2/repository/org/swinglabs/swingx/1.6.1/swingx-1.6.1.jar:/home/alberto/.m2/repository/com/jhlabs/filters/2.0.235/filters-2.0.235.jar:/home/alberto/.m2/repository/org/swinglabs/swing-worker/1.1/swing-worker-1.1.jar org.jmeld.JMeld $@
+JMELD_DIR=$(dirname "$(readlink -f "$0")")
+java -Xmx400m -jar $JMELD_DIR/jmeld.jar $@