diff --git a/java-1_8_0-openjdk.changes b/java-1_8_0-openjdk.changes
index 10f780b..8431a16 100644
--- a/java-1_8_0-openjdk.changes
+++ b/java-1_8_0-openjdk.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Jan  4 22:00:21 UTC 2015 - schwab@suse.de
+
+- zero-javadoc-verbose.patch: Avoid triggering inactivity timeout while
+  generating javadoc in zero VM
+
 -------------------------------------------------------------------
 Mon Dec  8 13:32:25 UTC 2014 - fstrba@suse.com
 
diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec
index b76d5f4..e825a30 100644
--- a/java-1_8_0-openjdk.spec
+++ b/java-1_8_0-openjdk.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package java-1_8_0-openjdk
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -221,6 +221,8 @@ Patch11:        hotspot-build-j-directive.patch
 Patch12:        adlc-parser.patch
 # Fix: implicit-pointer-decl
 Patch13:        implicit-pointer-decl.patch
+# Avoid triggering inactivity timeout while generating javadoc in zero VM
+Patch14:        zero-javadoc-verbose.patch
 #
 # OpenJDK specific patches
 #
@@ -509,6 +511,10 @@ rm -rvf jdk/src/share/native/sun/java2d/cmm/lcms/lcms2*
 %patch12 -p1
 %patch13 -p1
 
+%if %{with zero}
+%patch14 -p1
+%endif
+
 %patch99 -p1
 
 # s390 build fixes
diff --git a/zero-javadoc-verbose.patch b/zero-javadoc-verbose.patch
new file mode 100644
index 0000000..d105a2a
--- /dev/null
+++ b/zero-javadoc-verbose.patch
@@ -0,0 +1,12 @@
+Index: jdk8u-3e6d3c8810ee/make/Javadoc.gmk
+===================================================================
+--- jdk8u-3e6d3c8810ee.orig/make/Javadoc.gmk
++++ jdk8u-3e6d3c8810ee/make/Javadoc.gmk
+@@ -260,7 +260,6 @@ $(call CopyrightLine,$(COPYRIGHT_URL),$(
+ # Common javadoc options used by all
+ COMMON_JAVADOCFLAGS = \
+     -XDignore.symbol.file=true \
+-    -quiet \
+     -use \
+     -keywords \
+     -Xdoclint:none \