diff --git a/apache-ivy.changes b/apache-ivy.changes
index 36f99b3..26c19e4 100644
--- a/apache-ivy.changes
+++ b/apache-ivy.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Nov  6 10:58:10 UTC 2013 - mvyskocil@suse.com
+
+- Remove jakarta-commons-httpclient3, we do no longer provide it
+- Add ant.d config snippet for ivy
+- call add_maven_depmap
+
 -------------------------------------------------------------------
 Mon Sep  9 11:04:12 UTC 2013 - tchvatal@suse.com
 
diff --git a/apache-ivy.spec b/apache-ivy.spec
index 2b12a7d..9557204 100644
--- a/apache-ivy.spec
+++ b/apache-ivy.spec
@@ -26,6 +26,7 @@ Group:          Development/Tools/Building
 Url:            http://ant.apache.org/ivy/
 Source0:        %{name}-%{version}-src.tar.gz
 Source1:        ivy.1
+Source2:        http://repo1.maven.org/maven2/org/apache/ivy/ivy/2.3.0/ivy-2.3.0.pom
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
@@ -33,12 +34,8 @@ Provides:       ivy = %{version}-%{release}
 
 BuildRequires:  ant
 BuildRequires:  ant-nodeps
-%if 0%{?suse_version}
-BuildRequires:  jakarta-commons-httpclient3
-%else
-BuildRequires:  commons-httpclient
-%endif
 BuildRequires:  bouncycastle
+BuildRequires:  commons-httpclient
 BuildRequires:  java-devel >= 1.5
 BuildRequires:  javapackages-tools
 BuildRequires:  jsch
@@ -90,47 +87,45 @@ sed '/vfs.*=.*org.apache.ivy.plugins.resolver.VfsResolver/d' -i \
 
 # Craft class path
 mkdir -p lib
-build-jar-repository lib ant ant/ant-nodeps oro jsch \
-%if 0%{?suse_version}
-jakarta-commons-httpclient3
-%else
-commons-httpclient
-%endif
+build-jar-repository lib ant ant/ant-nodeps oro jsch commons-httpclient
 
 # Build
 ant -Dtarget.ivy.version=%{version} /localivy /offline jar javadoc
 
 %install
 # Code
-install -d $RPM_BUILD_ROOT%{_javadir}
-install -p -m644 build/artifact/jars/ivy.jar $RPM_BUILD_ROOT%{_javadir}/ivy-%{version}.jar
-ln -sf ivy-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/ivy.jar
+install -d %{buildroot}%{_javadir}
+install -p -m644 build/artifact/jars/ivy.jar %{buildroot}%{_javadir}/ivy.jar
+
+install -d -m 0755 %{buildroot}/%{_mavenpomdir}/
+install -m 0644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-ivy.pom
+# Maven depmap
+%add_maven_depmap JPP-ivy.pom ivy.jar
 
 # API Documentation
-install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -rp build/doc/reports/api/. $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+install -d %{buildroot}%{_javadocdir}/%{name}
+cp -rp build/doc/reports/api/. %{buildroot}%{_javadocdir}/%{name}
 
 # Command line script
 MAIN_CLASS=`sed -rn 's/^Main-Class: (.*)$/\1/gp' META-INF/MANIFEST.MF | tr -d '\r'`
-%if 0%{?suse_version}
-%jpackage_script "${MAIN_CLASS}" "" "" ant:ant/ant-nodeps:ivy:oro:jsch:jakarta-commons-httpclient3 ivy
-%else
 %jpackage_script "${MAIN_CLASS}" "" "" ant:ant/ant-nodeps:ivy:oro:jsch:commons-httpclient ivy
-%endif
+
+mkdir -p %{buildroot}%{_sysconfdir}/ant.d
+echo "ivy" > %{buildroot}%{_sysconfdir}/ant.d/%{name}
 
 # Man page
 install -d ${RPM_BUILD_ROOT}%{_mandir}/man1
 install %{SOURCE1} ${RPM_BUILD_ROOT}%{_mandir}/man1/ivy.1
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(-,root,root,-)
-%{_javadir}/*
 %doc RELEASE_NOTES CHANGES.txt LICENSE NOTICE README
+%config %{_sysconfdir}/ant.d/%{name}
+%{_javadir}/ivy.jar
 %attr(755,root,root) %{_bindir}/*
 %attr(644,root,root) %{_mandir}/man1/*
+%{_mavenpomdir}/JPP-ivy.pom
+%{_mavendepmapfragdir}/%{name}
 
 %files javadoc
 %defattr(-,root,root,-)
diff --git a/ivy-2.3.0.pom b/ivy-2.3.0.pom
new file mode 100644
index 0000000..10ee384
--- /dev/null
+++ b/ivy-2.3.0.pom
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.    
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache</groupId>
+    <artifactId>apache</artifactId>
+    <version>7</version>
+  </parent>
+  <groupId>org.apache.ivy</groupId>
+  <artifactId>ivy</artifactId>
+  <version>2.3.0</version>
+  <name>Apache Ivy</name>
+  <url>http://ant.apache.org/ivy/</url>
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/ant/ivy/core/trunk/</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ant/ivy/core/trunk</developerConnection>
+    <url>http://svn.apache.org/repos/asf/ant/ivy/core/trunk</url>
+  </scm>
+  <mailingLists>
+    <mailingList>
+      <name>Ant/Ivy Developers List</name>
+      <subscribe>dev-subscribe@ant.apache.org</subscribe>
+      <unsubscribe>dev-unsubscribe@ant.apache.org</unsubscribe>
+      <post>dev@ant.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/ant-dev</archive>
+    </mailingList>
+    <mailingList>
+      <name>Ivy Users List</name>
+      <subscribe>ivy-user-subscribe@ant.apache.org</subscribe>
+      <unsubscribe>ivy-user-unsubscribe@ant.apache.org</unsubscribe>
+      <post>ivy-user@ant.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/ant-ivy-user</archive>
+    </mailingList>
+  </mailingLists>
+  <issueManagement>
+    <system>jira</system>
+    <url>http://issues.apache.org/jira/browse/IVY</url>
+  </issueManagement>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant</artifactId>
+      <version>1.7.1</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant-nodeps</artifactId>
+      <version>1.7.1</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant-trax</artifactId>
+      <version>1.7.1</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>commons-httpclient</groupId>
+      <artifactId>commons-httpclient</artifactId>
+      <version>3.0</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>oro</groupId>
+      <artifactId>oro</artifactId>
+      <version>2.0.8</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>commons-vfs</groupId>
+      <artifactId>commons-vfs</artifactId>
+      <version>1.0</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.jcraft</groupId>
+      <artifactId>jsch</artifactId>
+      <version>0.1.31</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcpg-jdk14</artifactId>
+      <version>1.45</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcprov-jdk14</artifactId>
+      <version>1.45</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.6</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant-testutil</artifactId>
+      <version>1.7.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>ant</groupId>
+      <artifactId>ant-launcher</artifactId>
+      <version>1.6.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>ant-contrib</groupId>
+      <artifactId>ant-contrib</artifactId>
+      <version>1.0b3</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.6.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xmlParserAPIs</artifactId>
+      <version>2.6.2</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>