diff --git a/.classpath b/.classpath
index 7110dc412..f873dfd1b 100755
--- a/.classpath
+++ b/.classpath
@@ -60,7 +60,7 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="lib" path="lib/installer-exclude/libjitsi.jar" sourcepath="../libjitsi/src"/>
-	<classpathentry kind="lib" path="lib/installer-exclude/log4j-1.2.8.jar"/>
+	<classpathentry kind="lib" path="lib/bundle/log4j.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/mac_widgets-0.9.5.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/objenesis-1.2.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/otr4j.jar"/>
diff --git a/build.xml b/build.xml
index 7e6617025..3a8f28ca9 100644
--- a/build.xml
+++ b/build.xml
@@ -2059,21 +2059,6 @@ javax.swing.event, javax.swing.border"/>
             </jar>
     </target>
 
-    <!--BUNDLE-LOG4J -->
-    <target name="bundle-log4j">
-        <jar compress="true" destfile="lib/bundle/log4j.jar"
-            filesetmanifest="merge">
-
-            <zipfileset src="${lib.noinst}/log4j-1.2.8.jar" prefix=""/>
-            <manifest>
-                <attribute name="Export-Package" value="org.apache.log4j"/>
-                <attribute name="Bundle-Name" value="Apache log4j logging system"/>
-                <attribute name="Bundle-Description" value="Logging system."/>
-                <attribute name="System-Bundle" value="yes"/>
-            </manifest>
-        </jar>
-    </target>
-
     <!--BUNDLE-COMMONS-CODEC -->
     <target name="bundle-commons-codec">
         <copy file="${lib.noinst}/commons-codec-1.4.jar"
diff --git a/lib/bundle/log4j.jar b/lib/bundle/log4j.jar
index 0cfbb216e..1d425cf7d 100644
Binary files a/lib/bundle/log4j.jar and b/lib/bundle/log4j.jar differ
diff --git a/lib/installer-exclude/log4j-1.2.8.jar b/lib/installer-exclude/log4j-1.2.8.jar
deleted file mode 100644
index 493a3ccc1..000000000
Binary files a/lib/installer-exclude/log4j-1.2.8.jar and /dev/null differ