diff --git a/morfologik-addon/src/main/bin/morfologik-addon b/morfologik-addon/src/main/bin/morfologik-addon
index 70fb1d7..9b0faf9 100755
--- a/morfologik-addon/src/main/bin/morfologik-addon
+++ b/morfologik-addon/src/main/bin/morfologik-addon
@@ -32,4 +32,4 @@
 # Might fail if $0 is a link
 OPENNLP_HOME=`dirname "$0"`/..
 
-$JAVACMD -Xmx1024m -jar $OPENNLP_HOME/lib/apache-opennlp-morfologik-addon-*.jar $@
+$JAVACMD -Xmx1024m -cp "lib/*" opennlp.morfologik.cmdline.CLI $@
diff --git a/morfologik-addon/src/main/bin/morfologik-addon.bat b/morfologik-addon/src/main/bin/morfologik-addon.bat
index a69fbd6..aeec31f 100644
--- a/morfologik-addon/src/main/bin/morfologik-addon.bat
+++ b/morfologik-addon/src/main/bin/morfologik-addon.bat
@@ -40,7 +40,7 @@
 )
 
 REM #  Get the library JAR file name (JIRA OPENNLP-554)
-FOR %%A IN ("%OPENNLP_HOME%\lib\apache-opennlp-morfologik-addon-*.jar") DO SET JAR_FILE=%%A
+FOR %%A IN ("%OPENNLP_HOME%\lib\*.jar") DO SET JAR_FILE=%%A
 
 %JAVA_CMD% -Xmx1024m -jar %JAR_FILE% %*