diff --git a/bsf.changes b/bsf.changes
index 2d9a20f..d84816b 100644
--- a/bsf.changes
+++ b/bsf.changes
@@ -1,8 +1,9 @@
 -------------------------------------------------------------------
-Thu Jun  2 15:13:38 UTC 2016 - fstrba@suse.com
+Fri Jun  3 07:11:39 UTC 2016 - fstrba@suse.com
 
-- Update build-file.patch: Disable doclint feature while building
-  javadoc.
+- Add patch:
+  * build-file-doclint.patch: Disable doclint feature while
+    building javadoc with java-1_8_0-openjdk
 
 -------------------------------------------------------------------
 Wed Mar 25 09:24:47 UTC 2015 - tchvatal@suse.com
diff --git a/bsf.spec b/bsf.spec
index 2fed31d..62e3f5b 100644
--- a/bsf.spec
+++ b/bsf.spec
@@ -29,6 +29,7 @@ Source1000:     http://www.apache.org/dist/commons/bsf/source/%{name}-src-%{vers
 Source1001:     bsf.keyring
 Patch0:         build-file.patch
 Patch1:         build.properties.patch
+Patch2:         build-file-doclint.patch
 BuildRequires:  ant
 BuildRequires:  apache-commons-logging
 BuildRequires:  java-devel
@@ -92,6 +93,9 @@ rm -fr bsf
 
 %patch0 -p1
 %patch1 -p1
+%if 0%{?suse_version} >= 1330
+%patch2 -p1
+%endif
 
 %build
 [ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java
diff --git a/build-file-doclint.patch b/build-file-doclint.patch
new file mode 100644
index 0000000..15bc5a9
--- /dev/null
+++ b/build-file-doclint.patch
@@ -0,0 +1,12 @@
+Index: bsf-2.4.0/build.xml
+===================================================================
+--- bsf-2.4.0.orig/build.xml
++++ bsf-2.4.0/build.xml
+@@ -272,6 +274,7 @@ Copyright:
+ 			<fileset dir="${src.dir}">
+ 				<patternset refid="java.source.files"></patternset>
+ 			</fileset>
++			<arg value="-Xdoclint:none"/>
+ 		</javadoc>
+ 
+ 	</target>
diff --git a/build-file.patch b/build-file.patch
index b2abff4..d44a47b 100644
--- a/build-file.patch
+++ b/build-file.patch
@@ -25,11 +25,3 @@ Index: bsf-2.4.0/build.xml
  
  		<uptodate property="javadoc.required" targetfile="${build.lib}/${project.name}.jar">
  			<srcfiles dir="${build.dir}" includes="**/*.html" />
-@@ -272,6 +274,7 @@ Copyright:
- 			<fileset dir="${src.dir}">
- 				<patternset refid="java.source.files"></patternset>
- 			</fileset>
-+			<arg value="-Xdoclint:none"/>
- 		</javadoc>
- 
- 	</target>