diff --git a/classes/java.bbclass b/classes/java.bbclass
index b68035c..fecd7f5 100644
--- a/classes/java.bbclass
+++ b/classes/java.bbclass
@@ -13,9 +13,9 @@ libdir_jni ?= ${libdir}/jni
 # JVM bundle location on target
 libdir_jvm ?= ${libdir}/jvm
 
-STAGING_DATADIR_JAVA ?= ${STAGING_DATADIR}/java
-STAGING_LIBDIR_JNI ?= ${STAGING_LIBDIR}/jni
-STAGING_LIBDIR_JVM ?= ${STAGING_LIBDIR}/jvm
+STAGING_DATADIR_JAVA ?= ${STAGING_DIR_JAVA}
+STAGING_LIBDIR_JNI   ?= ${STAGING_LIBDIR}/jni
+STAGING_LIBDIR_JVM   ?= ${STAGING_LIBDIR}/jvm
 
 STAGING_DATADIR_JAVA_NATIVE ?= ${STAGING_DATADIR_NATIVE}/java
 STAGING_LIBDIR_JNI_NATIVE ?= ${STAGING_LIBDIR_NATIVE}/jni
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index d1ed040..bfc28d5 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -264,6 +264,7 @@ B = "${S}"
 
 STAGING_DIR = "${TMPDIR}/staging"
 
+STAGING_DIR_JAVA = "${STAGING_DIR}/java"
 STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}"
 STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_bindir}"
 STAGING_BINDIR_CROSS  = "${STAGING_DIR_NATIVE}${layout_bindir}/${MULTIMACH_HOST_SYS}"