diff --git a/src/Makefile b/src/Makefile
index deaa63a..55da741 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -147,7 +147,7 @@ gen-jni-headers: codegen $(JNI_GENERATED_HH)
 # While "old" (Java 8) javah needs a list of java classes (e.g. foundation.pEp.jniadapter.Message)
 $(JNI_GENERATED_HH):
 ifeq ($(USE_JAVAH),1)
-	cd $(JAVA_DIR)/;$(JAVA_BIN_DIR)/$(JAVAH_CMD) -d ../../src/$(CXX_DIR) $(subst ${ },${space}\${\n},$(subst /,.,$(patsubst %.java,%, $(subst java/,,$(sort $(wildcard java/foundation/pEp/jniadapter/*.java))))))
+	cd $(JAVA_DIR)/;$(JAVA_BIN_DIR)/$(JAVAH_CMD) -d ../$(CXX_DIR) $(subst ${ },${space}\${\n},$(subst /,.,$(patsubst %.java,%, $(subst $(JAVA_DIR),,$(sort $(wildcard $(JAVA_DIR)$(JAVA_PKG_BASENAME)*.java))))))
 else
 	cd $(JAVA_DIR);$(JAVA_BIN_DIR)/$(JAVAC_CMD) -d ../$(JAVA_BUILD_ROOT) -h ../$(CXX_DIR)/ $(JAVA_PKG_BASENAME)/*.java
 endif