diff --git a/dev-lang/openjdk/openjdk-1.8.u40_b27.recipe b/dev-lang/openjdk/openjdk-1.8.u40_b27.recipe
index 80a91d580..127f176cc 100644
--- a/dev-lang/openjdk/openjdk-1.8.u40_b27.recipe
+++ b/dev-lang/openjdk/openjdk-1.8.u40_b27.recipe
@@ -9,7 +9,7 @@ OpenJDK is the official Java SE 7 reference implementation."
 HOMEPAGE="http://openjdk.java.net/"
 COPYRIGHT="2015 Oracle and/or its affiliates."
 LICENSE="GNU GPL v2"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="https://bitbucket.org/hamishm/haiku-jdk8u/get/6e3a7c2446ea.zip"
 CHECKSUM_SHA256="68cb8171d84b1a0c12e20b2ecc968a12ed8f64d39858a6e3af9e287877c2245e"
 SOURCE_DIR="hamishm-haiku-jdk8u-6e3a7c2446ea"
@@ -17,6 +17,7 @@ PATCHES="openjdk-1.8.u40_b27.patchset"
 SOURCE_URI_2="https://bitbucket.org/hamishm/haiku-jdk8u-hotspot/get/e5ab6f7ff241.zip"
 CHECKSUM_SHA256_2="241b78f84c7d39a1b93c78e5bf0e02414aae92574450fd043fa6771a9bf18103"
 SOURCE_DIR_2="hamishm-haiku-jdk8u-hotspot-e5ab6f7ff241"
+PATCHES_2="openjdk-1.8.u40_b27-source2.patchset"
 SOURCE_URI_3="https://bitbucket.org/hamishm/haiku-jdk8u-jdk/get/9b3967c76020.zip"
 CHECKSUM_SHA256_3="a64e0109b51f4bf9e5902a7053ea69fe3caa58df03146c2dc0d3c586e389ee86"
 SOURCE_DIR_3="hamishm-haiku-jdk8u-jdk-9b3967c76020"
@@ -47,7 +48,7 @@ ADDITIONAL_FILES="
 	"
 
 ARCHITECTURES="!x86_gcc2 ?x86"
-SECONDARY_ARCHITECTURES="?x86"
+SECONDARY_ARCHITECTURES="x86"
 
 DISABLE_SOURCE_PACKAGE=yes
 	# at least as long as Ant and a complete SDK image are part of the sources
diff --git a/dev-lang/openjdk/patches/openjdk-1.8.u40_b27-source2.patchset b/dev-lang/openjdk/patches/openjdk-1.8.u40_b27-source2.patchset
new file mode 100644
index 000000000..b885ca3fb
--- /dev/null
+++ b/dev-lang/openjdk/patches/openjdk-1.8.u40_b27-source2.patchset
@@ -0,0 +1,34 @@
+From c4926a7e0c8c778fa12d60522591d7bb7fbc5bc5 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Wed, 20 Dec 2017 18:20:29 +0100
+Subject: Fix out of memory error.
+
+Apply patch suggested by hamishm.
+
+diff --git a/src/os_cpu/haiku_x86/vm/os_haiku_x86.cpp b/src/os_cpu/haiku_x86/vm/os_haiku_x86.cpp
+index cf2e698..1f94aba 100644
+--- a/src/os_cpu/haiku_x86/vm/os_haiku_x86.cpp
++++ b/src/os_cpu/haiku_x86/vm/os_haiku_x86.cpp
+@@ -548,18 +548,7 @@ bool os::is_allocatable(size_t bytes) {
+   // unused on amd64?
+   return true;
+ #else
+-
+-  if (bytes < 2 * G) {
+-    return true;
+-  }
+-
+-  char* addr = reserve_memory(bytes, NULL);
+-
+-  if (addr != NULL) {
+-    release_memory(addr, bytes);
+-  }
+-
+-  return addr != NULL;
++  return bytes <= (size_t)1400 * M;
+ #endif // AMD64
+ }
+ 
+-- 
+2.15.0
+