diff --git a/Makefile b/Makefile
index 59458e1dd55a7b5d110e4d800fd38062446942a3..837d45cf67f54c5fd94d825b99f6e30434476711 100644
--- a/Makefile
+++ b/Makefile
@@ -2,30 +2,26 @@
 # Plugin, welches Matroska/FFv1 via mediaconch validiert
 
 # Pfad zu Java
-JAVAPATH=$(wildcard /usr/lib/jvm/java-1.17.0-openjdk-*/bin/)
-JAVARELEASE=17
+JAVAPATH:=$(wildcard /usr/lib/jvm/java-1.17.0-openjdk-*/bin/)
+JAVARELEASE:=17
 
 # Verwendete Rosetta-Version
 # ROSETTAVERSION:=7.3.0
 ROSETTAVERSION:=8.2.0
 
 # Pfad zum Rosetta-SDK
-ROSETTASDK:=/exlibris/dps/d4_1/system.dir/dps-sdk-${ROSETTAVERSION}/lib/
-# Pfad zum Rosetta-SDK, Deposit-Module
-ROSETTASDKDEPOSIT:=${ROSETTASDK}/../dps-sdk-projects/dps-sdk-deposit/lib
-ROSETTASDKPLUGINS:=${ROSETTASDK}/../../bundled_plugins/
-ROSETTASDKJARS=$(shell find ${ROSETTASDKDEPOSIT} -name "*.jar")
+ROSETTASDK:=/exlibris/dps/d4_1/system.dir/dps-sdk-${ROSETTAVERSION}/dps-sdk-projects/dps-sdk-deposit/lib/
 
 # classpath
 JUNITCLASSPATH:=/usr/share/java/junit4.jar
-#SOURCESCLASSPATH=org/slub/rosetta/dps/repository/plugin/storage/nfs
-CLASSPATH:=${ROSETTASDKDEPOSIT}/dps-sdk-${ROSETTAVERSION}.jar
-#BUILDPATH=$(CLASSPATH)
+CLASSPATH:=$(shell find ${ROSETTASDK} -name "*.jar" -print | xargs echo | sed -e "s/ /:/g")
 
 # sources
-SOURCES:=java/org/slub/rosetta/dps/repository/plugin/SLUBMatroskaFFV1FormatValidationPlugin.java
+PLUGINCLASS:=SLUBMatroskaFFV1FormatValidationPlugin
+SOURCES:=java/org/slub/rosetta/dps/repository/plugin/${PLUGINCLASS}.java
 OBJS:=$(SOURCES:.java=.class)
-JAR:=SLUBMatroskaFFV1FormatValidationPlugin.jar
+PLUGINVERSION:=$(shell grep -o "<version>.*</version>" PLUGIN-INF/*.xml | sed -e "s#<version>##g" | sed -e "s#</version>##g")
+JAR:=${PLUGINCLASS}-${PLUGINVERSION}_sdk-${ROSETTAVERSION}.jar
 BUILD:=build/
 
 all: $(BUILD) $(JAR)