diff --git a/apache-commons-codec.spec b/apache-commons-codec.spec
index 2ce95e6..132a86c 100644
--- a/apache-commons-codec.spec
+++ b/apache-commons-codec.spec
@@ -1,45 +1,34 @@
-# READ BEFORE UPDATING: After updating this package to new upstream
-# version eclipse-ecf should be rebuilt.  For more info, see:
-# https://fedoraproject.org/wiki/SIGs/Java#Package_Update.2FRebuild_Notes
+Name:           apache-commons-codec
+Version:        1.11
+Release:        2%{?dist}
+Summary:        Implementations of common encoders and decoders
+License:        ASL 2.0
+URL:            http://commons.apache.org/codec/
+BuildArch:      noarch
 
-%global base_name codec
-%global short_name commons-%{base_name}
-
-Name:          apache-%{short_name}
-Version:       1.11
-Release:       1%{?dist}
-Summary:       Implementations of common encoders and decoders
-License:       ASL 2.0
-URL:           http://commons.apache.org/%{base_name}/
-BuildArch:     noarch
-
-Source0:       http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
+Source0:        http://archive.apache.org/dist/commons/codec/source/commons-codec-%{version}-src.tar.gz
 # Data in DoubleMetaphoneTest.java originally has an inadmissible license.
 # The author gives MIT in e-mail communication.
-Source1:       aspell-mail.txt
+Source1:        aspell-mail.txt
 
-BuildRequires: maven-local
-BuildRequires: mvn(org.apache.commons:commons-parent:pom:)
-BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin)
+BuildRequires:  maven-local
+BuildRequires:  mvn(org.apache.commons:commons-parent:pom:)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-assembly-plugin)
 
 %description
 Commons Codec is an attempt to provide definitive implementations of
 commonly used encoders and decoders. Examples include Base64, Hex,
 Phonetic and URLs.
 
-%package javadoc
-Summary:       API documentation for %{name}
-
-%description javadoc
-%{summary}.
+%{?javadoc_package}
 
 %prep
-%setup -q -n %{short_name}-%{version}-src
+%autosetup -n commons-codec-%{version}-src
 cp %{SOURCE1} aspell-mail.txt
 sed -i 's/\r//' RELEASE-NOTES*.txt LICENSE.txt NOTICE.txt
 
-%mvn_file : %{short_name} %{name}
-%mvn_alias : %{short_name}:%{short_name}
+%mvn_file : commons-codec %{name}
+%mvn_alias : commons-codec:commons-codec
 
 %build
 %mvn_build
@@ -51,10 +40,10 @@ sed -i 's/\r//' RELEASE-NOTES*.txt LICENSE.txt NOTICE.txt
 %license LICENSE.txt NOTICE.txt aspell-mail.txt
 %doc RELEASE-NOTES*
 
-%files javadoc -f .mfiles-javadoc
-%license LICENSE.txt NOTICE.txt aspell-mail.txt
-
 %changelog
+* Mon Jan 29 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.11-2
+- Cleanup spec file
+
 * Fri Nov 24 2017 Mat Booth <mat.booth@redhat.com> - 1.11-1
 - Update to latest upstream version