diff --git a/javassist-rel_3_21_0_ga-javadoc.patch b/javassist-rel_3_21_0_ga-javadoc.patch
new file mode 100644
index 0000000..0ef09e5
--- /dev/null
+++ b/javassist-rel_3_21_0_ga-javadoc.patch
@@ -0,0 +1,44 @@
+--- javassist-rel_3_21_0_ga/src/main/javassist/bytecode/analysis/package.html	2016-10-03 17:44:29.000000000 +0200
++++ javassist-rel_3_21_0_ga/src/main/javassist/bytecode/analysis/package.html	2017-09-08 10:13:36.599899677 +0200
+@@ -11,10 +11,10 @@
+ <p>The users of this package must know the specifications of
+ class file and Java bytecode.  For more details, read this book:
+ 
+-<ul>Tim Lindholm and Frank Yellin,
++<ul><li>Tim Lindholm and Frank Yellin,
+ "The Java Virtual Machine Specification 2nd Ed.",
+ Addison-Wesley, 1999.
+-</ul>
++</li></ul>
+ 
+ </body>
+ </html>
+--- javassist-rel_3_21_0_ga/src/main/javassist/bytecode/package.html	2016-10-03 17:44:29.000000000 +0200
++++ javassist-rel_3_21_0_ga/src/main/javassist/bytecode/package.html	2017-09-08 10:12:48.055898848 +0200
+@@ -9,10 +9,10 @@
+ <p>The users of this package must know the specifications of
+ class file and Java bytecode.  For more details, read this book:
+ 
+-<ul>Tim Lindholm and Frank Yellin,
++<ul><li>Tim Lindholm and Frank Yellin,
+ "The Java Virtual Machine Specification 2nd Ed.",
+ Addison-Wesley, 1999.
+-</ul>
++</li></ul>
+ 
+ </body>
+ </html>
+--- javassist-rel_3_21_0_ga/src/main/javassist/package.html	2016-10-03 17:44:29.000000000 +0200
++++ javassist-rel_3_21_0_ga/src/main/javassist/package.html	2017-09-08 10:14:14.935900331 +0200
+@@ -12,9 +12,9 @@
+ 
+ <p>To know the version number of this package, type the following command:
+ 
+-<ul><pre>
++<ul><li><pre>
+ java -jar javassist.jar
+-</pre></ul>
++</pre></li></ul>
+ 
+ <p>It prints the version number on the console.
+ 
diff --git a/javassist.changes b/javassist.changes
index 6c05290..ca75fac 100644
--- a/javassist.changes
+++ b/javassist.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Sep  8 08:16:21 UTC 2017 - fstrba@suse.com
+
+- Specify java target and source version 1.6 in order to allow
+  building with jdk9
+- Added patch:
+  * javassist-rel_3_21_0_ga-javadoc.patch
+    - fix javadoc errors that are fatal with jdk9
+
 -------------------------------------------------------------------
 Fri Jun  9 10:14:10 UTC 2017 - tchvatal@suse.com
 
diff --git a/javassist.spec b/javassist.spec
index cd71bef..44ed99b 100644
--- a/javassist.spec
+++ b/javassist.spec
@@ -27,6 +27,7 @@ Version:        3.21.0
 Release:        0
 Url:            http://www.csg.ci.i.u-tokyo.ac.jp/~chiba/javassist/
 Source0:        https://github.com/jboss-javassist/javassist/archive/%{tar_version}.tar.gz
+Patch0:         javassist-rel_3_21_0_ga-javadoc.patch
 BuildRequires:  ant >= 1.6
 BuildRequires:  java-devel >= 1.6
 BuildRequires:  javapackages-tools
@@ -76,12 +77,13 @@ Tutorial for javassist.
 
 %prep
 %setup -q -n %{name}-%{tar_version}
+%patch0 -p1
 for j in $(find . -name "*.jar"); do
         mv $j $j.no
 done
 
 %build
-ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 dist
+ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 dist
 
 %install
 # jars