diff --git a/google-guice.spec b/google-guice.spec
index eb56eec..2856f5d 100644
--- a/google-guice.spec
+++ b/google-guice.spec
@@ -118,14 +118,10 @@ Summary:        Bill of Materials for Guice
 Guice is a lightweight dependency injection framework for Java 5
 and above. This package provides Bill of Materials module for Guice.
 
-%package javadoc
-Summary:        API documentation for Guice
-
-%description javadoc
-This package provides %{summary}.
+%{?javadoc_package}
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 
 # We don't have struts2 in Fedora yet.
 %pom_disable_module struts2 extensions
@@ -184,10 +180,9 @@ This package provides %{summary}.
 %mvn_install
 
 %files -f .mfiles-guice
-%dir %{_javadir}/guice
 
 %files -n guice-parent -f .mfiles-guice-parent
-%doc COPYING
+%license COPYING
 
 %files -n guice-assistedinject -f .mfiles-guice-assistedinject
 %files -n guice-extensions -f .mfiles-extensions-parent
@@ -200,10 +195,6 @@ This package provides %{summary}.
 
 %files -n guice-bom -f .mfiles-guice-bom
 
-%files javadoc -f .mfiles-javadoc
-%doc COPYING
-
-
 %changelog
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.2-2
 - Mass rebuild for javapackages-tools 201901