diff --git a/debian/changelog b/debian/changelog
index 912f933ae..e596f2a84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ cmake (2.8.1-5) UNRELEASED; urgency=low
   [ Modestas Vainius ]
   * Add procps to Build-Depends and cmake Depends. cmake sometimes uses ps
     binary.
+  * FindJNI patch: avoid using trick bits of cmake IF() command syntax.
+    This should fix FindJNI on architectures which do not need special
+    CMAKE_SYSTEM_PROCESSOR handling (e.g. ia64).
 
  -- Kai Wasserbäch <debian@carbon-project.org>  Thu, 27 May 2010 00:56:35 +0200
 
diff --git a/debian/patches/FindJNI_fix_libarch_determination.diff b/debian/patches/FindJNI_fix_libarch_determination.diff
index 2712fe492..ca7d77628 100644
--- a/debian/patches/FindJNI_fix_libarch_determination.diff
+++ b/debian/patches/FindJNI_fix_libarch_determination.diff
@@ -67,7 +67,7 @@ Last-Update: 2010-05-17
 +        SET(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}" "s390" "s390x")
 +    ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^sh")
 +        SET(_java_libarch "sh")
-+    ELSEIF("${CMAKE_SYSTEM_PROCESSOR}")
++    ELSE(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
 +        SET(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}")
 +    ENDIF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
 +