diff --git a/src/package/launcher-linux.sh b/src/package/launcher-linux.sh
index 6ceb933b0..4ce8e6670 100644
--- a/src/package/launcher-linux.sh
+++ b/src/package/launcher-linux.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 cd $(dirname $0)
 java \
-	-cp "libs/*" \
+	-p "libs" \
 	-Dcryptomator.settingsPath="~/.config/Cryptomator/settings.json" \
 	-Dcryptomator.ipcPortPath="~/.config/Cryptomator/ipcPort.bin" \
 	-Dcryptomator.logDir="~/.local/share/Cryptomator/logs" \
@@ -9,4 +9,4 @@ java \
 	-Djdk.gtk.version=2 \
 	-Xss2m \
 	-Xmx512m \
-	org.cryptomator.launcher.Cryptomator
+	-m org.cryptomator.desktop/org.cryptomator.launcher.Cryptomator
diff --git a/src/package/launcher-mac.sh b/src/package/launcher-mac.sh
index 2c06efab2..100c975b5 100644
--- a/src/package/launcher-mac.sh
+++ b/src/package/launcher-mac.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 cd $(dirname $0)
 java \
-	-cp "libs/*" \
+	-p "libs" \
 	-Dcryptomator.settingsPath="~/Library/Application Support/Cryptomator/settings.json" \
 	-Dcryptomator.ipcPortPath="~/Library/Application Support/Cryptomator/ipcPort.bin" \
 	-Dcryptomator.logDir="~/Library/Logs/Cryptomator" \
 	-Dcryptomator.mountPointsDir="/Volumes" \
 	-Xss20m \
 	-Xmx512m \
-	org.cryptomator.launcher.Cryptomator
\ No newline at end of file
+	-m org.cryptomator.desktop/org.cryptomator.launcher.Cryptomator
\ No newline at end of file
diff --git a/src/package/launcher-win.bat b/src/package/launcher-win.bat
index d385d7e28..b809b3b04 100644
--- a/src/package/launcher-win.bat
+++ b/src/package/launcher-win.bat
@@ -1,6 +1,6 @@
 @echo off
 java ^
-	-cp "libs/*" ^
+	-p "libs" ^
 	-Dcryptomator.settingsPath="~/AppData/Roaming/Cryptomator/settings.json" ^
 	-Dcryptomator.ipcPortPath="~/AppData/Roaming/Cryptomator/ipcPort.bin" ^
 	-Dcryptomator.logDir="~/AppData/Roaming/Cryptomator" ^
@@ -8,4 +8,4 @@ java ^
 	-Dcryptomator.keychainPath="~/AppData/Roaming/Cryptomator/keychain.json" ^
 	-Xss20m ^
 	-Xmx512m ^
-	org.cryptomator.launcher.Cryptomator
\ No newline at end of file
+	-m org.cryptomator.desktop/org.cryptomator.launcher.Cryptomator
\ No newline at end of file