diff --git a/jodconverter-core/.gitignore b/jodconverter-core/.gitignore
new file mode 100644
index 000000000..e97c6ee6f
--- /dev/null
+++ b/jodconverter-core/.gitignore
@@ -0,0 +1,2 @@
+target/
+*.class
diff --git a/jodconverter-core/pom.xml b/jodconverter-core/pom.xml
index 8b8d0719b..1e918c68e 100644
--- a/jodconverter-core/pom.xml
+++ b/jodconverter-core/pom.xml
@@ -113,6 +113,19 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>1.6</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
@@ -149,7 +162,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2-beta-5</version>
+        <version>2.2</version>
         <configuration>
           <descriptors>
             <descriptor>src/main/assembly/dist.xml</descriptor>