diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec
index 5b3bf02..a55e38f 100644
--- a/httpcomponents-client.spec
+++ b/httpcomponents-client.spec
@@ -5,12 +5,11 @@ Release:           2%{?dist}
 License:           ASL 2.0
 URL:               http://hc.apache.org/
 Source0:           http://www.apache.org/dist/httpcomponents/httpclient/source/%{name}-%{version}-src.tar.gz
+BuildArch:         noarch
 
 Patch0:            0001-Use-system-copy-of-effective_tld_names.dat.patch
 Patch1:            0002-Port-to-mockito-2.patch
 
-BuildArch:         noarch
-
 BuildRequires:     maven-local
 BuildRequires:     mvn(commons-codec:commons-codec)
 BuildRequires:     mvn(commons-logging:commons-logging)
@@ -40,11 +39,7 @@ Summary:        Cache module for %{name}
 %description    cache
 This package provides client side caching for %{name}.
 
-%package        javadoc
-Summary:        API documentation for %{name}
-
-%description    javadoc
-%{summary}.
+%{?javadoc_package}
 
 %prep
 %setup -q -n %{name}-%{version}
@@ -151,15 +146,12 @@ rm -r httpclient-cache/src/*/java/org/apache/http/impl/client/cache/ehcache
 %install
 %mvn_install
 
-
 %files -f .mfiles
-%doc LICENSE.txt NOTICE.txt README.txt RELEASE_NOTES.txt
+%license LICENSE.txt NOTICE.txt
+%doc README.txt RELEASE_NOTES.txt
 
 %files cache -f .mfiles-cache
 
-%files javadoc -f .mfiles-javadoc
-%doc LICENSE.txt NOTICE.txt
-
 %changelog
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.5.8-2
 - Mass rebuild for javapackages-tools 201901