diff --git a/.gitignore b/.gitignore
index b6cbe7e..fa67ae2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,3 +58,4 @@
 /javapackages-3.4.0.tar.xz
 /javapackages-3.4.1.tar.xz
 /javapackages-3.4.2.tar.xz
+/javapackages-3.5.0.tar.xz
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index bd20caa..b19296d 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -1,6 +1,6 @@
 Name:           javapackages-tools
-Version:        3.4.2
-Release:        3%{?dist}
+Version:        3.5.0
+Release:        1%{?dist}
 
 Summary:        Macros and scripts for Java packaging support
 
@@ -8,9 +8,6 @@ License:        BSD
 URL:            https://fedorahosted.org/javapackages/
 Source0:        https://fedorahosted.org/released/javapackages/javapackages-%{version}.tar.xz
 
-# Backported from upstream commits 61c9ae9 and 322ef52
-Patch0:         0001-Allow-ZIP-files-in-usr-share-java.patch
-
 BuildArch:      noarch
 
 BuildRequires:  jpackage-utils
@@ -73,6 +70,22 @@ Requires:       maven-surefire-provider-testng
 %description -n maven-local
 This package provides macros and scripts to support packaging Maven artifacts.
 
+%package -n ivy-local
+Summary:        Local mode for Apache Ivy
+Requires:       %{name} = %{version}-%{release}
+Requires:       apache-ivy
+Requires:       guava
+Requires:       maven
+Requires:       plexus-classworlds
+Requires:       plexus-containers-container-default
+Requires:       plexus-utils
+Requires:       xbean
+Requires:       xmvn
+
+%description -n ivy-local
+This package implements local mode fow Apache Ivy, which allows
+artifact resolution using XMvn resolver.
+
 %package -n python-javapackages
 Summary:        Module for handling various files for Java packaging
 Requires:       python-lxml
@@ -93,7 +106,6 @@ Requires:       fedora-review
 
 %prep
 %setup -q -n javapackages-%{version}
-%patch0 -p1
 
 %build
 %configure
@@ -125,6 +137,8 @@ popd
 
 %files -n maven-local -f files-maven
 
+%files -n ivy-local -f files-ivy
+
 %files -n python-javapackages
 %doc LICENSE
 %{python_sitelib}/javapackages*
@@ -134,6 +148,10 @@ popd
 
 
 %changelog
+* Thu Jan 16 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.5.0-1
+- Update to upstream version 3.5.0
+- Add ivy-local subpackage
+
 * Tue Jan  7 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.4.2-3
 - Update patch for ZIP files
 
diff --git a/sources b/sources
index 48e5666..f733f20 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8a47adf390a8130eba6a7a3e40ad1ba2  javapackages-3.4.2.tar.xz
+c3eccf51b90a81e05b10e110fee603ed  javapackages-3.5.0.tar.xz