diff --git a/apache-ivy.spec b/apache-ivy.spec
index 4b600b0..a0c4fb4 100644
--- a/apache-ivy.spec
+++ b/apache-ivy.spec
@@ -1,6 +1,6 @@
 Name:           apache-ivy
 Version:        2.3.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Java-based dependency manager
 
 Group:          Development/Tools
@@ -12,16 +12,12 @@ BuildArch:      noarch
 Provides:       ivy = %{version}-%{release}
 
 BuildRequires:  ant
+BuildRequires:  bouncycastle
+BuildRequires:  bouncycastle-pg
 BuildRequires:  jakarta-commons-httpclient
 BuildRequires:  jsch
 BuildRequires:  jakarta-oro
-BuildRequires:  java-devel >= 1.5
-BuildRequires:  jpackage-utils
-Requires:       jpackage-utils
-Requires:       jakarta-oro
-Requires:       jsch
-Requires:       ant
-Requires:       jakarta-commons-httpclient
+BuildRequires:  maven-local
 
 %description
 Apache Ivy is a tool for managing (recording, tracking, resolving and
@@ -52,6 +48,12 @@ do
 done
 rm -fr src/java/org/apache/ivy/plugins/signer/bouncycastle
 
+# ant-trax has been obsoleted, use main ant package
+sed -i s/ant-trax/ant/ ivy.xml
+
+# Fedora bouncycastle packages provide -jdk16 artifacts only
+sed -i /bouncycastle/s/jdk14/jdk16/ ivy.xml
+
 %build
 # Remove prebuilt documentation
 rm -rf doc build/doc
@@ -72,30 +74,26 @@ ant /localivy /offline -Dtarget.ivy.bundle.version=%{version} -Dtarget.ivy.bundl
 
 
 %install
-# Code
-install -d $RPM_BUILD_ROOT%{_javadir}
-install -p -m644 build/artifact/jars/ivy.jar $RPM_BUILD_ROOT%{_javadir}/ivy.jar
-
-# Maven depmap
-%add_maven_depmap org.apache.ivy:ivy:%{version} ivy.jar
-
-# API Documentation
-install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp build/doc/reports/api/. $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+%mvn_file : %{name} ivy
+%mvn_artifact ivy.xml build/artifact/jars/ivy.jar
+sed -i "/rawPom/{p;s//effectivePom/g}" .xmvn-reactor
+%mvn_install -J build/doc/reports/api
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ant.d
 echo "ivy" > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/%{name}
 
 %files -f .mfiles
-%{_javadir}/*
 %{_sysconfdir}/ant.d/%{name}
 %doc RELEASE_NOTES CHANGES.txt LICENSE NOTICE README
 
-%files javadoc
-%{_javadocdir}/*
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE
 
 %changelog
+* Wed Dec  4 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.3.0-4
+- Install POM files, resolves: rhbz#1032258
+- Remove explicit requires; auto-requires are in effect now
+
 * Fri Nov  1 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.3.0-3
 - Add Maven depmap