diff --git a/debian/changelog b/debian/changelog
index 3509ca495..b5563facf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 cmake (2.8.1-3) UNRELEASED; urgency=low
 
+  * Rewrite _java_libarch determination code in FindJNI.cmake (based on
+    new code in OpenJDK 1.6.0_18). This should fix invalid _java_libarch
+    detection on mipsel and armel (patch
+    FindJNI_fix_libarch_determination.diff) (Closes: #544674).
 
  -- Modestas Vainius <modax@debian.org>  Sat, 01 May 2010 22:25:55 +0300
 
diff --git a/debian/patches/FindJNI_fix_libarch_determination.diff b/debian/patches/FindJNI_fix_libarch_determination.diff
new file mode 100644
index 000000000..a3c26a81c
--- /dev/null
+++ b/debian/patches/FindJNI_fix_libarch_determination.diff
@@ -0,0 +1,74 @@
+From: Modestas Vainius <modax@debian.org>
+Subject: Fix libarch determination based on openjdk 1.6.0_18 code
+ OpenJDK build system has been rewritten sometime between 1.6.0_16 and 1.6.0_18
+ and now it features improved JRE_ARCH_DIR determination. This patch rewrites
+ ${_java_libarch} determination code in FindJNI.cmake accordingly (it is not a
+ straight port though because OpenJDK build system bases its decisions on GNU
+ triplet now which is not available for cmake). As a side effect, this should
+ fix invalid ${_java_libarch} determination on armel and mipsel.
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=544674
+Bug: http://public.kitware.com/Bug/view.php?id=9611
+Origin: vendor
+Forwarded: no
+
+--- a/Modules/FindJNI.cmake
++++ b/Modules/FindJNI.cmake
+@@ -29,24 +29,40 @@
+ # Expand {libarch} occurences to java_libarch subdirectory(-ies) and set ${_var}
+ MACRO(java_append_library_directories _var)
+     # Determine java arch-specific library subdir
+-    IF (CMAKE_SYSTEM_NAME MATCHES "Linux")
+-        # Based on openjdk/jdk/make/common/shared/Platform.gmk as of 6b16
+-        # and kaffe as of 1.1.8 which uses the first part of the
+-        # GNU config.guess platform triplet.
+-        IF(CMAKE_SYSTEM_PROCESSOR MATCHES "^i[3-9]86$")
+-            SET(_java_libarch "i386")
+-        ELSEIF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+-            SET(_java_libarch "amd64" "x86_64")
+-        ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^ppc")
+-            SET(_java_libarch "ppc" "powerpc" "ppc64")
+-        ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^sparc")
+-            SET(_java_libarch "sparc" "sparcv9")
+-        ELSE(CMAKE_SYSTEM_PROCESSOR MATCHES "^i[3-9]86$")
+-            SET(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}")
+-        ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^i[3-9]86$")
+-    ELSE(CMAKE_SYSTEM_NAME MATCHES "Linux")
+-        SET(_java_libarch "i386" "amd64" "ppc") # previous default
+-    ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
++    # Based on acinclude.m4 (JRE_ARCH_DIR) as of openjdk 1.6.0_18
++    # and kaffe as of 1.1.8 which uses the first part of the
++    # GNU config.guess platform triplet.
++    IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
++        SET(_java_libarch "amd64")
++    ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86$")
++        SET(_java_libarch "i386")
++    ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^alpha")
++        SET(_java_libarch "alpha")
++    ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
++        SET(_java_libarch "arm")
++    ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
++        IF(CMAKE_CROSSCOMPILING)
++            SET(_java_libarch "mips" "mipsel")
++        ELSE(CMAKE_CROSSCOMPILING)
++            INCLUDE(TestBigEndian)
++            TEST_BIG_ENDIAN(_java_bigendian)
++            IF(_java_bigendian)
++                SET(_java_libarch "mips")
++            ELSE(_java_bigendian)
++                SET(_java_libarch "mipsel")
++            ENDIF(_java_bigendian)
++        ENDIF(CMAKE_CROSSCOMPILING)
++    ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^ppc64")
++        SET(_java_libarch "ppc64")
++    ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^ppc")
++        SET(_java_libarch "ppc")
++    ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^sparc")
++        SET(_java_libarch "sparc" "sparcv9")
++    ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^sh.*-.*-.*$")
++        SET(_java_libarch "sh")
++    ELSE(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
++        SET(_java_libarch ${CMAKE_SYSTEM_PROCESSOR})
++    ENDIF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+ 
+     FOREACH(_path ${ARGN})
+         IF(_path MATCHES "{libarch}")
diff --git a/debian/patches/series b/debian/patches/series
index 45fc6f45b..564ab454f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 hurd_platform.diff
 kFreeBSD_fixes.diff
+FindJNI_fix_libarch_determination.diff