diff --git a/tools/ninja/pom.xml b/tools/ninja/pom.xml
index 21e7eb5d981..33b24e8a8c6 100644
--- a/tools/ninja/pom.xml
+++ b/tools/ninja/pom.xml
@@ -250,6 +250,9 @@
                         <goals>
                             <goal>repackage</goal>
                         </goals>
+                        <configuration>
+                            <layout>ZIP</layout>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
diff --git a/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/NinjaUtils.java b/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/NinjaUtils.java
index 36d046adda1..800bf5d9071 100644
--- a/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/NinjaUtils.java
+++ b/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/NinjaUtils.java
@@ -70,7 +70,7 @@ public static JCommander setupCommandLineParser() {
         }
 
         JCommander jc = builder.build();
-        jc.setProgramName("java [-cp <jdbc_driver_jar>] -jar ninja.jar");
+        jc.setProgramName("java [-Dloader.path=<jdbc_driver_jar_path>] -jar ninja.jar");
         jc.setColumnSize(150);
         jc.setAtFileCharset(Charset.forName(base.getCharset()));