diff --git a/pom.xml b/pom.xml
index 20dcd4c..2475c2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,30 +119,31 @@
                 </executions>
             </plugin>
 
-             <plugin>
-            <artifactId>maven-assembly-plugin</artifactId>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>3.3.0</version>
+                <configuration>
+                    <appendAssemblyId>true</appendAssemblyId>
+                    <descriptors>
+                        <descriptor>src/assembly/jar-distribution.xml</descriptor>
+                        <descriptor>src/assembly/bin-distribution.xml</descriptor>
+                    </descriptors>
+                    <archive>
+                        <manifest>
+                            <mainClass>org.ids_mannheim.TotalNGrams</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
                 <executions>
                     <execution>
+                        <id>make-assembly</id>
                         <phase>package</phase>
                         <goals>
                             <goal>single</goal>
                         </goals>
                     </execution>
                 </executions>
-                <configuration>
-                    <archive>
-                        <index>true</index>
-                        <manifest>
-                            <addClasspath>true</addClasspath>
-                            <classpathPrefix>dependency/</classpathPrefix>
-                            <mainClass>org.ids_mannheim.TotalNGrams</mainClass>
-                        </manifest>
-                    </archive>
-                    <descriptorRefs>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
-                    <appendAssemblyId>false</appendAssemblyId>
-                </configuration>
             </plugin>
 
             <plugin>
@@ -158,8 +159,14 @@
                     </execution>
                 </executions>
                 <configuration>
+                    <!--we use the appassembler-maven-plugin only to generate shell script wrappers -->
                     <binFolder>bin</binFolder>
                     <extraJvmArguments>-XX:MaxRAMPercentage=85 -Dgroovy.grape.enable=false</extraJvmArguments>
+                    <useWildcardClassPath>true</useWildcardClassPath>
+                    <repositoryLayout>flat</repositoryLayout>
+                    <generateRepository>false</generateRepository>
+                    <repositoryName>.</repositoryName>
+                    <assembleDirectory>${project.build.directory}</assembleDirectory>
                     <binFileExtensions>
                         <unix/>
                     </binFileExtensions>