diff --git a/zookeeper-3.4.6-ivy-build.patch b/zookeeper-3.4.6-ivy-build.patch
index 437bd48..09c1e97 100644
--- a/zookeeper-3.4.6-ivy-build.patch
+++ b/zookeeper-3.4.6-ivy-build.patch
@@ -24,6 +24,62 @@ index 442d52e..bc1f4a2 100644
+diff --git a/ivy.xml b/ivy.xml
+index 561832a..0d9e2ed 100644
+--- a/ivy.xml
++++ b/ivy.xml
+@@ -58,12 +58,12 @@
+
+
+-
+
+
+-
+
+
+
+-
+-
+-
+-
+-
+
+
++
+
+-
+-
+-
++
+
+
+-
+-
+-
++
+
+
+
diff --git a/src/contrib/build-contrib.xml b/src/contrib/build-contrib.xml
index 0e57d08..708f64f 100644
--- a/src/contrib/build-contrib.xml
@@ -50,3 +106,16 @@ index 0e57d08..708f64f 100644
+diff --git a/src/contrib/build.xml b/src/contrib/build.xml
+index 7f7ba4f..701dfea 100644
+--- a/src/contrib/build.xml
++++ b/src/contrib/build.xml
+@@ -20,7 +20,7 @@
+
+
+
+-
++
+
+
+
diff --git a/zookeeper.spec b/zookeeper.spec
index ccde1b0..17e49ff 100644
--- a/zookeeper.spec
+++ b/zookeeper.spec
@@ -43,6 +43,7 @@ BuildRequires: jtoaster
BuildRequires: junit
%if 0%{?fedora} >= 21
BuildRequires: mvn(org.slf4j:slf4j-log4j12)
+BuildRequires: javapackages-tools
%else
BuildRequires: mvn(log4j:log4j)
%endif
@@ -118,7 +119,7 @@ package
pushd src/c
autoreconf -if
-%configure
+%configure --disable-static --disable-rpath
%{__make} %{?_smp_mflags}
popd
@@ -151,13 +152,14 @@ install -pm 755 %{SOURCE3} %{buildroot}%{_libexecdir}
%if 0%{?fedora} >= 21
mkdir -p %{buildroot}%{_datadir}/maven-metadata
-mkdir -p %{buildroot}%{_datadir}/maven-poms/%{name}
+mkdir -p %{buildroot}%{_datadir}/maven-poms
+install -pm 644 build/%{name}-%{version}/dist-maven/%{name}-%{version}.pom %{buildroot}%{_datadir}/maven-poms/%{name}-%{name}.pom
%add_maven_depmap %{name}-%{name}.pom %{name}/%{name}.jar
%add_maven_depmap org.apache.zookeeper:zookeeper::tests:%{version} %{name}/%{name}-tests.jar
-install -pm 644 %{SOURCE1} %{buildroot}%{_datadir}/maven-poms/%{name}/%{name}-%{name}-ZooInspector.pom
-sed -i "s|@version@|%{version}|" %{buildroot}%{_datadir}/maven-poms/%{name}/%{name}-%{name}-ZooInspector.pom
+install -pm 644 %{SOURCE1} %{buildroot}%{_datadir}/maven-poms/%{name}-%{name}-ZooInspector.pom
+sed -i "s|@version@|%{version}|" %{buildroot}%{_datadir}/maven-poms/%{name}-%{name}-ZooInspector.pom
%add_maven_depmap %{name}-%{name}-ZooInspector.pom %{name}/%{name}-ZooInspector.jar
%else
mkdir -p %{buildroot}%{_mavenpomdir}
@@ -169,7 +171,6 @@ install -pm 644 build/%{name}-%{version}/dist-maven/%{name}-%{version}.pom %{bui
install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-ZooInspector.pom
sed -i "s|@version@|%{version}|" %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-ZooInspector.pom
%add_maven_depmap JPP.%{name}-%{name}-ZooInspector.pom %{name}/%{name}-ZooInspector.jar
-
%endif
mkdir -p %{buildroot}%{_javadocdir}/%{name}
@@ -226,8 +227,8 @@ getent passwd zookeeper >/dev/null || \
%{_javadir}/%{name}/%{name}-ZooInspector.jar
%if 0%{?fedora} >= 21
-%{_datadir}/maven-poms/%{name}/%{name}-%{name}.pom
-%{_datadir}/maven-poms/%{name}/%{name}-%{name}-ZooInspector.pom
+%{_datadir}/maven-poms/%{name}-%{name}.pom
+%{_datadir}/maven-poms/%{name}-%{name}-ZooInspector.pom
%{_datadir}/maven-metadata/%{name}.xml
%else
%{_mavendepmapfragdir}/%{name}