diff --git a/cdi-api.spec b/cdi-api.spec
index 49e62fb..0a98401 100644
--- a/cdi-api.spec
+++ b/cdi-api.spec
@@ -1,7 +1,3 @@
-
-%global namedreltag .NOTHING
-%global namedversion %{version}%{?namedreltag}
-
 Name:             cdi-api
 Version:          1.2
 Release:          9%{?dist}
@@ -26,11 +22,7 @@ BuildRequires:    mvn(org.testng:testng::jdk15:)
 %description
 APIs for JSR-299: Contexts and Dependency Injection for Java EE
 
-%package javadoc
-Summary:          Javadoc for %{name}
-
-%description javadoc
-This package contains the API documentation for %{name}.
+%{?javadoc_package}
 
 %prep
 %setup -q -n cdi-%{version}
@@ -60,10 +52,6 @@ cd api
 %license spec/src/main/doc/license-asl2.%{adoc}
 %license spec/src/main/doc/license-jcp.%{adoc}
 
-%files javadoc -f api/.mfiles-javadoc
-%license spec/src/main/doc/license-asl2.%{adoc}
-%license spec/src/main/doc/license-jcp.%{adoc}
-
 %changelog
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-9
 - Mass rebuild for javapackages-tools 201901