diff -Nur zookeeper-3.4.5/build.xml zookeeper-3.4.5-daviddavid/build.xml
--- zookeeper-3.4.5/build.xml	2015-01-02 19:07:23.000000000 +0100
+++ zookeeper-3.4.5-daviddavid/build.xml	2015-01-02 19:10:01.545006713 +0100
@@ -97,6 +97,7 @@
               value="file:/usr/share/java/" />
     <property name="ivy.home" value="${basedir}/.ant" />
     <property name="ivy.lib" value="/usr/share/java"/>
+    <property name="ivy.liblog4j12" value="/usr/lib/java"/>
     <property name="ivy.package.lib" value="${build.dir}/package/lib"/>
     <property name="ivy.test.lib" value="${build.dir}/test/lib"/>
     <property name="ivy.jdiff.lib" value="${build.dir}/jdiff/lib"/>
@@ -180,6 +181,9 @@
       <fileset dir="${ivy.lib}">
         <include name="**/*.jar" />
       </fileset>
+      <fileset dir="${ivy.liblog4j12}">
+        <include name="**/*.jar" />
+      </fileset>
     </path>
 
     <path id="test.java.classpath">
@@ -203,6 +207,7 @@
         <mkdir dir="${build.classes}" />
 
         <mkdir dir="${ivy.lib}"/>
+        <mkdir dir="${ivy.liblog4j12}"/>
         <mkdir dir="${ivy.package.lib}"/>
         <mkdir dir="${ivy.test.lib}"/>
         <condition property="ivy.jar.exists">
@@ -310,7 +315,7 @@
 
     <target name="ivy-retrieve" depends="init,ivy-init">
       <ivy:retrieve settingsRef="${ant.project.name}" type="jar" conf="default"
-                    pattern="${ivy.lib}/[artifact].[ext]"/>
+                    pattern="${ivy.lib*}/[artifact].[ext]"/>
     </target>
 
     <target name="ivy-retrieve-test" depends="init,ivy-init">
@@ -617,6 +622,7 @@
           <exclude name="**/ivy*.jar" />
         </fileset>
         <fileset dir="${ivy.lib}"/>
+        <fileset dir="${ivy.liblog4j12}"/>
       </copy>
 
       <subant target="package">
@@ -721,6 +727,7 @@
           <exclude name="**/deb*.jar" />
         </fileset>
         <fileset dir="${ivy.lib}"/>
+        <fileset dir="${ivy.liblog4j12}"/>
       </copy>
 
       <copy file="${basedir}/src/packages/update-zookeeper-env.sh" tofile="${dist.dir}/sbin/update-zookeeper-env.sh"/>
@@ -1279,7 +1286,7 @@
         <mkdir dir="${findbugs.out.dir}" />
         <findbugs home="${findbugs.home}" output="xml:withMessages" excludeFilter="${findbugs.exclude.file}" 
                 outputFile="${findbugs.report.xmlfile}" effort="max" jvmargs="-Xmx512M">
-            <auxClasspath path="${ivy.lib}/log4j.jar" />
+            <auxClasspath path="${ivy.liblog4j12}/log4j-1.2.17.jar" />
             <sourcePath path="${java.src.dir}" />
             <class location="${build.dir}/${final.name}.jar" />
         </findbugs>
@@ -1305,6 +1312,9 @@
           <fileset dir="${ivy.lib}">
             <include name="**/*.jar" />
           </fileset>
+          <fileset dir="${ivy.liblog4j12}">
+            <include name="**/*.jar" />
+          </fileset>
         </classpath>
       </taskdef>
 
@@ -1335,6 +1345,9 @@
                 <fileset dir="${ivy.lib}">
                   <include name="**/*.jar" />
                 </fileset>
+                <fileset dir="${ivy.liblog4j12}">
+                  <include name="**/*.jar" />
+                </fileset>
             </classpath>
             <classpath>
                 <pathelement path="${test.java.classes}" />
diff -Nur zookeeper-3.4.5/ivy.xml zookeeper-3.4.5-daviddavid/ivy.xml 
--- zookeeper-3.4.5/ivy.xml	2015-01-02 19:07:22.000000000 +0100
+++ zookeeper-3.4.5-daviddavid/ivy.xml	2015-01-02 18:37:24.568032377 +0100
@@ -43,7 +43,7 @@
     <dependency org="org.slf4j" name="slf4j/log4j12" rev="" transitive="false"/>
   
     <!-- transitive false turns off dependency checking, log4j deps seem borked -->
-    <dependency org="log4j" name="log4j" rev="" transitive="false" conf="default"/>
+    <dependency org="log4j-1.2.17" name="log4j-1.2.17" rev="" transitive="false" conf="default"/>
     <!--<dependency org="jline" name="jline" rev="" transitive="false" conf="default"/>-->
 
     <!--<dependency org="io.netty" name="netty" conf="default" rev="">
diff -Nur zookeeper-3.4.5/ivysettings.xml zookeeper-3.4.5-daviddavid/ivysettings.xml
--- zookeeper-3.4.5/ivysettings.xml	2015-01-02 19:07:22.000000000 +0100
+++ zookeeper-3.4.5-daviddavid/ivysettings.xml	2015-01-02 18:48:08.538023932 +0100
@@ -23,6 +23,8 @@
     value="file:///usr/share/java/" override="false"/>
   <property name="repo.sun.org"
     value="file:///usr/share/java/" override="false"/>
+    <property name="repo.liblog4j12.org"
+    value="file:///usr/lib/java/" override="false"/>
   <property name="maven2.pattern"
     value="[module]"/>
   <property name="maven2.pattern.ext" value="${maven2.pattern}.[ext]"/>
@@ -35,11 +37,14 @@
       pattern="${maven2.pattern.ext}" m2compatible="true"/>
     <ibiblio name="sun-maven2" root="${repo.sun.org}"
       pattern="${maven2.pattern.ext}" m2compatible="true"/>
+    <ibiblio name="liblog4j12" root="${repo.liblog4j12.org}"
+      pattern="${maven2.pattern.ext}" m2compatible="true"/>
 
     <chain name="default" dual="true">
       <resolver ref="maven2"/>
       <resolver ref="jboss-maven2"/>
       <resolver ref="sun-maven2"/>
+      <resolver ref="liblog4j12"/>
     </chain>
 
   </resolvers>
diff -Nur zookeeper-3.4.5/src/contrib/build-contrib.xml zookeeper-3.4.5-daviddavid/src/contrib/build-contrib.xml
--- zookeeper-3.4.5/src/contrib/build-contrib.xml	2015-01-02 19:07:23.000000000 +0100
+++ zookeeper-3.4.5-daviddavid/src/contrib/build-contrib.xml	2015-01-02 19:14:24.472003265 +0100
@@ -46,6 +46,7 @@
             value="file:/usr/share/java/" />
   <property name="ivy.home" value="${user.home}/.ant" />
   <property name="ivy.lib" value="/usr/share/java"/>
+  <property name="ivy.liblog4j12" value="/usr/lib/java"/>
   <property name="ivy.test.lib" value="${build.test}/lib"/>
   <property name="ivysettings.xml" value="${zk.root}/ivysettings.xml"/>
 
@@ -73,12 +74,14 @@
     <fileset dir="/usr/share/java">
       <include name="jline.jar" />
       <include name="jtoaster.jar" />
-      <include name="log4j.jar" />
       <include name="netty.jar" />
       <include name="slf4j/api.jar" />
       <include name="slf4j/log4j12.jar" />
       <include name="xerces-j2.jar" />
     </fileset>
+    <fileset dir="/usr/lib/java">
+      <include name="log4j-1.2.17.jar" />
+    </fileset>
     <fileset dir="${zk.root}/build">
       <include name="zookeeper-${version}.jar" />
     </fileset>
@@ -94,6 +97,7 @@
     <mkdir dir="${build.test}"/>
 
     <mkdir dir="${ivy.lib}"/>
+    <mkdir dir="${ivy.liblog4j12}"/>
     <mkdir dir="${ivy.test.lib}"/>
     <condition property="ivy.jar.exists">
       <available file="${lib.dir}/ivy.jar"/>