diff --git a/bsf.spec b/bsf.spec
index c03247b..a5ee153 100644
--- a/bsf.spec
+++ b/bsf.spec
@@ -31,15 +31,14 @@ Patch0:         build-file.patch
 Patch1:         build.properties.patch
 BuildRequires:  ant
 BuildRequires:  apache-commons-logging
-# Disable this one whenever the javadoc build is fixed for jdk9
-BuildRequires:  java-1_8_0-openjdk-devel
+BuildRequires:  java-devel >= 1.6
 BuildRequires:  javapackages-local
 BuildRequires:  javapackages-tools
 BuildRequires:  rhino
 BuildRequires:  xalan-j2
 BuildRequires:  xml-commons-apis
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
+BuildConflicts: java-devel >= 1.9
 
 %description
 Bean Scripting Framework (BSF) is a set of Java classes that provides
@@ -113,14 +112,12 @@ install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr build/javadocs/* %{buildroot}%{_javadocdir}/%{name}
 
 %files
-%defattr(-,root,root)
 %doc LICENSE.txt AUTHORS.txt CHANGES.txt NOTICE.txt README.txt TODO.txt RELEASE-NOTE.txt
 %{_javadir}/*
 %{_mavenpomdir}/JPP-%{name}.pom
 %{_datadir}/maven-metadata/%{name}.xml
 
 %files javadoc
-%defattr(-,root,root)
 %dir %{_javadocdir}/%{name}
 %{_javadocdir}/%{name}