diff --git a/debian/changelog b/debian/changelog
index 4872e46a8..ca2d4df4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,8 @@ cmake (3.2.2-1) UNRELEASED; urgency=low
     libcurl4-openssl-dev. (Closes: #785128)
   * Properly detect mipsel as little endian architecture. (Closes: #785126)
     - Add fix-mips-endian.patch
+  * Fix detection of openjdk 8. (Closes: #772631)
+    - Add openjdk-8-detection.patch
 
  -- Mario Lang <mlang@debian.org>  Mon, 27 Apr 2015 22:31:13 +0200
 
diff --git a/debian/patches/openjdk-8-detection.patch b/debian/patches/openjdk-8-detection.patch
new file mode 100644
index 000000000..259b345b4
--- /dev/null
+++ b/debian/patches/openjdk-8-detection.patch
@@ -0,0 +1,28 @@
+From 7953867ba46223dfab373ce58cff0a4bc20c3864 Mon Sep 17 00:00:00 2001
+From: Felix Geyer <debfx@ubuntu.com>
+Date: Tue, 12 May 2015 13:45:43 -0400
+Subject: [PATCH] FindJava: Fix OpenJDK 8 version detection (#15565)
+
+The openjdk-8 (8u45-b14-2) package on Debian unstable has extra
+text after the version number components.  Match this and add it
+to the reported version string.
+---
+ Modules/FindJava.cmake |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake
+index bb73853..9e43174 100644
+--- a/Modules/FindJava.cmake
++++ b/Modules/FindJava.cmake
+@@ -137,7 +137,7 @@ if(Java_JAVA_EXECUTABLE)
+       elseif(var MATCHES "java full version \"kaffe-([0-9]+\\.[0-9]+\\.[0-9_]+)\"")
+         # Kaffe style
+         set(Java_VERSION_STRING "${CMAKE_MATCH_1}")
+-      elseif(var MATCHES "openjdk version \"([0-9]+\\.[0-9]+\\.[0-9_]+)\"")
++      elseif(var MATCHES "openjdk version \"([0-9]+\\.[0-9]+\\.[0-9_]+.*)\"")
+         # OpenJDK ver 1.7.x on OpenBSD
+         set(Java_VERSION_STRING "${CMAKE_MATCH_1}")
+       else()
+-- 
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
index f44a6dd08..75d9709b4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ cpack-doc-typo.patch
 protect-tests-from-makeflags.patch
 custom-sphinx-flags.patch
 fix-mips-endian.patch
+openjdk-8-detection.patch