diff --git a/.gitignore b/.gitignore
index 193c3e4..838fd20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /.project
 /commons-codec-1.7-src.tar.gz
 /commons-codec-1.8-src.tar.gz
+/commons-codec-1.9-src.tar.gz
diff --git a/apache-commons-codec.spec b/apache-commons-codec.spec
index e3ff589..5a48145 100644
--- a/apache-commons-codec.spec
+++ b/apache-commons-codec.spec
@@ -2,37 +2,21 @@
 %global short_name commons-%{base_name}
 
 Name:          apache-%{short_name}
-Version:       1.8
-Release:       5%{?dist}
+Version:       1.9
+Release:       1%{?dist}
 Summary:       Implementations of common encoders and decoders
-Group:         Development/Libraries
 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
 # Data in DoubleMetaphoneTest.java originally has an inadmissible license.
 # The author gives MIT in e-mail communication.
 Source1:       aspell-mail.txt
 
-
-BuildArch:     noarch
-
-BuildRequires: java-devel
-BuildRequires: jpackage-utils
 BuildRequires: maven-local
-BuildRequires: maven-antrun-plugin
-BuildRequires: maven-assembly-plugin
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-doxia-sitetools
-BuildRequires: maven-plugin-bundle
-BuildRequires: maven-surefire-plugin
-BuildRequires: maven-surefire-provider-junit4
-Requires:      java
-Requires:      jpackage-utils
+BuildRequires: mvn(org.apache.commons:commons-parent)
+BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin)
 
 # It looks like there are packages in F-18 that BR/R the short name
 Provides:      %{short_name} = %{version}-%{release}
@@ -50,8 +34,6 @@ Phonetic and URLs.
 
 %package javadoc
 Summary:       API documentation for %{name}
-Group:         Documentation
-Requires:      jpackage-utils
 Provides:      jakarta-%{short_name}-javadoc = %{version}-%{release}
 Obsoletes:     jakarta-%{short_name}-javadoc < %{version}-%{release}
 
@@ -63,36 +45,26 @@ Obsoletes:     jakarta-%{short_name}-javadoc < %{version}-%{release}
 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}
+
 %build
-mvn-rpmbuild install javadoc:aggregate
+%mvn_build
 
 %install
-# jars
-install -d -m 755 %{buildroot}%{_javadir}
-install -p -m 644 target/%{short_name}-%{version}.jar \
-  %{buildroot}%{_javadir}/%{short_name}.jar
-ln -sf %{short_name}.jar %{buildroot}%{_javadir}/%{name}.jar
+%mvn_install
 
-# javadocs
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-# pom
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -p -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
-%add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar -a "%{short_name}:%{short_name}"
-
-%files
+%files -f .mfiles
 %doc LICENSE.txt NOTICE.txt RELEASE-NOTES* aspell-mail.txt
-%{_mavendepmapfragdir}/*
-%{_mavenpomdir}/*
-%{_javadir}/*
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE.txt NOTICE.txt aspell-mail.txt
-%{_javadocdir}/%{name}
 
 %changelog
+* Mon Jan  6 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.9-1
+- Update to upstream version 1.9
+- Update to current packaging guidelines
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index e2b015c..f65c01e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-60cdbb3f5319310242e3aacec22ef566  commons-codec-1.8-src.tar.gz
+db87f7004cefc9d17f7ac841f86122bd  commons-codec-1.9-src.tar.gz