diff --git a/java-utils/java-functions b/java-utils/java-functions
index 458b85a..d395a10 100644
--- a/java-utils/java-functions
+++ b/java-utils/java-functions
@@ -310,7 +310,8 @@ do_find_jar() {
    extension=$1
 
    for jardir in "$JVM_LIBDIR" "$JAVAVER_JNIDIR" "$JAVAVER_LIBDIR" \
-                 "$JAVAAPP_LIBDIR" "$JNI_LIBDIR" "$JAVA_LIBDIR" ; do
+                 "$JAVAAPP_LIBDIR" "$JNI_LIBDIR" "$JAVA_LIBDIR" \
+                 "$JAVAJNI_LIBDIR"; do
       if [ -d "$jardir" ] ; then
          if [ -r "$jardir/$extension.jar" ] ; then
             echo "$jardir/$extension.jar"
diff --git a/misc/macros.jpackage b/misc/macros.jpackage
index a767509..c6e1319 100644
--- a/misc/macros.jpackage
+++ b/misc/macros.jpackage
@@ -81,7 +81,14 @@
 #   - jars for Java standard x.y.z (usually symlinks to  %{_jnidir}-ext)
 # To simplify things only %{_jnidir} is defined.
 #
-%_jnidir        %{_prefix}/lib/java
+%_jnidir        %{_libdir}/java
+
+
+# 
+# Directory where architecture-independent that use
+# architecture-dependent files are placed
+#
+%_javajnidir    %{_datadir}/java-jni
 
 #
 # Root directory where all javadoc is installed. Also already in RH macros.