diff --git a/build.xml b/build.xml
index 2187e3ef0..f4c3ef7a8 100644
--- a/build.xml
+++ b/build.xml
@@ -59,7 +59,7 @@
         <javac srcdir="${server.src.dir}" destdir="${server_classes.dir}" debug="true" includeAntRuntime="no">
             <classpath refid="class.path" />
         </javac>
-        <copy file="${conf.dir}/log4j.properties" tofile="${server_classes.dir}/log4j.properties"/>
+        <copy file="${server.src.dir}/log4j.properties" tofile="${server_classes.dir}/log4j.properties"/>
     </target>
             
     <target name="build" depends="build_server">
@@ -69,7 +69,7 @@
             <src path="${src.dir}"/>
             <classpath refid="class.path" />
         </javac>
-        <copy file="${conf.dir}/log4j.properties" tofile="${webapp_classes.dir}/log4j.properties"/>
+        <copy file="${server.src.dir}/log4j.properties" tofile="${webapp_classes.dir}/log4j.properties"/>
     </target>
 
     <target name="build_tests" depends="build">
diff --git a/src/conf/log4j.properties b/src/server/java/log4j.properties
similarity index 100%
rename from src/conf/log4j.properties
rename to src/server/java/log4j.properties