diff --git a/java-1_8_0-openjdk.changes b/java-1_8_0-openjdk.changes
index 16280f5..2f42be1 100644
--- a/java-1_8_0-openjdk.changes
+++ b/java-1_8_0-openjdk.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Mar 29 06:28:28 UTC 2018 - fstrba@suse.com
+
+- Added patch:
+  * no-return-in-nonvoid-function.patch
+    + fix broken build with gcc8 (bsc#1087066)
+
 -------------------------------------------------------------------
 Thu Mar  1 06:55:49 UTC 2018 - fstrba@suse.com
 
diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec
index 6539adb..117d70b 100644
--- a/java-1_8_0-openjdk.spec
+++ b/java-1_8_0-openjdk.spec
@@ -205,6 +205,7 @@ Patch1001:      java-1_8_0-openjdk-suse-desktop-files.patch
 Patch2000:      java-1_8_0-openjdk-gcc6.patch
 Patch2001:      disable-doclint-by-default.patch
 Patch2002:      aarch64.patch
+Patch2003:      no-return-in-nonvoid-function.patch
 BuildRequires:  alsa-lib-devel
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -554,6 +555,7 @@ patch -p0 -i %{PATCH104}
 patch -p0 -i %{PATCH2000}
 patch -p0 -i %{PATCH2001}
 patch -p0 -i %{PATCH2002}
+patch -p0 -i %{PATCH2003}
 
 (cd openjdk/common/autoconf
  bash ./autogen.sh
diff --git a/no-return-in-nonvoid-function.patch b/no-return-in-nonvoid-function.patch
new file mode 100644
index 0000000..f638547
--- /dev/null
+++ b/no-return-in-nonvoid-function.patch
@@ -0,0 +1,10 @@
+--- openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp	2018-02-26 02:17:58.000000000 +0100
++++ openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp	2018-03-29 07:57:45.644810996 +0200
+@@ -541,6 +541,7 @@
+   err.report_and_die();
+ 
+   ShouldNotReachHere();
++  return false;
+ }
+ 
+ void os::Linux::init_thread_fpu_state(void) {