diff --git a/atinject.spec b/atinject.spec
index 6137262..e5642b2 100644
--- a/atinject.spec
+++ b/atinject.spec
@@ -1,6 +1,6 @@
 Name:           atinject
 Version:        1
-Release:        25.20100611svn86%{?dist}
+Release:        26.20100611svn86%{?dist}
 Summary:        Dependency injection specification for Java (JSR-330)
 License:        ASL 2.0
 URL:            http://code.google.com/p/atinject/
@@ -13,11 +13,9 @@ BuildArch:      noarch
 # rm -rf atinject-1/{lib,javadoc}/
 # tar caf atinject-1.tar.xz atinject-1
 Source0:        %{name}-%{version}.tar.xz
-
 # These manifests based on the ones shipped by eclipse.org
 Source1:        MANIFEST.MF
 Source2:        MANIFEST-TCK.MF
-
 Source3:        http://www.apache.org/licenses/LICENSE-2.0.txt
 
 # Compile with source/target 1.5
@@ -36,12 +34,6 @@ traditional approaches such as constructors, factories, and service
 locators (e.g., JNDI). This process, known as dependency injection, is
 beneficial to most nontrivial applications.
 
-%package        javadoc
-Summary:        API documentation for %{name}
-
-%description    javadoc
-%{summary}.
-
 %package        tck
 Summary:        TCK for testing %{name} compatibility with JSR-330
 Requires:       %{name} = %{version}-%{release}
@@ -50,6 +42,8 @@ Requires:       junit
 %description    tck
 %{summary}.
 
+%{?javadoc_package}
+
 %prep
 %setup -q
 cp %{SOURCE3} LICENSE
@@ -82,26 +76,20 @@ jar umf %{SOURCE2} build/tck/dist/javax.inject-tck.jar
 %mvn_artifact pom.xml build/dist/javax.inject.jar
 %mvn_artifact tck-pom.xml build/tck/dist/javax.inject-tck.jar
 
-%install
-%mvn_install
+mv build/tck/javadoc build/javadoc/tck
 
-# Javadocs
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}/tck
-cp -pr build/javadoc/* %{buildroot}%{_javadocdir}/%{name}
-cp -pr build/tck/javadoc/* %{buildroot}%{_javadocdir}/%{name}/tck
+%install
+%mvn_install -J build/javadoc
 
 %files -f .mfiles
-%doc LICENSE
-%dir %{_javadir}/javax.inject
-%dir %{_mavenpomdir}/javax.inject
+%license LICENSE
 
 %files tck -f .mfiles-tck
 
-%files javadoc
-%doc LICENSE
-%{_javadocdir}/atinject
-
 %changelog
+* Mon Jan 29 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 1-26.20100611svn86
+- Cleanup spec file
+
 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1-25.20100611svn86
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild