diff --git a/byteman.spec b/byteman.spec
index 5f1c4de..334b5af 100644
--- a/byteman.spec
+++ b/byteman.spec
@@ -6,7 +6,7 @@
 
 Name:             byteman
 Version:          4.0.3
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Java agent-based bytecode injection tool
 License:          LGPLv2+
 URL:              http://www.jboss.org/byteman
@@ -69,8 +69,6 @@ This package contains the Byteman rule check maven plugin.
 
 %prep
 %setup -q -n byteman-%{version}
-# Fix doclint problem
-%pom_xpath_inject  "pom:plugin[pom:artifactId = 'maven-javadoc-plugin']/pom:configuration" "<additionalparam>-Xdoclint:none</additionalparam>"
 
 # Fix the gid:aid for java_cup
 sed -i "s|net.sf.squirrel-sql.thirdparty-non-maven|java_cup|" agent/pom.xml
@@ -101,6 +99,10 @@ sed -i "s|java-cup|java_cup|" tests/pom.xml
 %pom_disable_module download
 %pom_disable_module docs
 
+# Don't use javadoc plugin, use XMvn for javadocs
+%pom_remove_plugin -r :maven-javadoc-plugin
+%pom_xpath_remove 'pom:execution[pom:id="make-javadoc-assembly"]' byteman
+
 # Put maven plugin into a separate package
 %mvn_package ":byteman-rulecheck-maven-plugin" rulecheck-maven-plugin
 
@@ -154,6 +156,9 @@ ln -s %{_javadir}/byteman/byteman.jar $RPM_BUILD_ROOT%{homedir}/lib/byteman.jar
 %license docs/copyright.txt
 
 %changelog
+* Thu Jul 05 2018 Severin Gehwolf <sgehwolf@redhat.com> - 4.0.3-2
+- Don't use maven-javadoc-plugin. Use XMvn instead.
+
 * Tue Jul 03 2018 Severin Gehwolf <sgehwolf@redhat.com> - 4.0.3-1
 - Update to latest upstream 4.0.3 release.