diff --git a/java-1_8_0-openjdk.changes b/java-1_8_0-openjdk.changes
index 59b2152..24768b6 100644
--- a/java-1_8_0-openjdk.changes
+++ b/java-1_8_0-openjdk.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue May 31 06:47:43 UTC 2016 - fstrba@suse.com
+
+- Added patch:
+  * java-1_8_0-openjdk-gcc6.patch
+    + Fix build with gcc 6.1
+- Add -fno-delete-null-pointer-checks -fno-lifetime-dse to try to 
+  avoid some crashes
+
 -------------------------------------------------------------------
 Thu Apr 28 08:19:17 UTC 2016 - fstrba@suse.com
 
diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec
index fee9715..7c94d04 100644
--- a/java-1_8_0-openjdk.spec
+++ b/java-1_8_0-openjdk.spec
@@ -429,9 +429,8 @@ export ZLIB_CFLAGS=" "
 export ZLIB_LIBS="-L/%{_lib} -lz"
 %endif
 
-export CFLAGS=$(rpm -E '%{optflags}' | sed 's/-Wall\>//')
+export CFLAGS="$(rpm -E '%{optflags}' | sed 's/-Wall\>//') -Wno-error -fno-delete-null-pointer-checks -fno-lifetime-dse"
 export CXXFLAGS=${CFLAGS}
-
 %if %{with_sunec}
 export NSS_SOFTOKN_CFLAGS="`pkg-config --cflags nss` -I`pwd`"
 export NSS_SOFTOKN_LIBS="-L%{_libdir} -lnssdbm3 -lsoftokn3 -lssl3 -lsmime3 -lnss3 -lnssutil3 -lfreebl -L%{_libdir}/nspr -lplds4 -lplc4 -lnspr4"