diff --git a/webapp/build.xml b/webapp/build.xml
index 66f76b1c8..d670a0670 100644
--- a/webapp/build.xml
+++ b/webapp/build.xml
@@ -322,6 +322,9 @@ deploy   - Deploy the application directly into the Tomcat webapps directory.
 		<copy tofile="${solr.docbase}">
 			<fileset file="${solr.war}" />
 		</copy>
+		<war destfile="${solr.docbase}" update="true">
+			<classes dir="${webapp.dir}/config/solr/" />
+		</war>
 
 		<!-- Create the context configuration XML with expanded properties. -->
 		<copy tofile="${solr.context.config}" filtering="true">
@@ -336,7 +339,7 @@ deploy   - Deploy the application directly into the Tomcat webapps directory.
           target: deploySolr                      
          - - - - - - - - - - - - - - - - - -->
 	<target name="deploySolr" depends="prepareSolr" unless="noSolrDeploy">
-		<copy todir="${tomcat.home}/conf/Catalina/localhost">
+		<copy todir="${tomcat.home}/conf/Catalina/localhost" overwrite="true" >
 			<fileset file="${solr.context.config}" />
 		</copy>
 	</target>
diff --git a/webapp/config/solr/logging.properties b/webapp/config/solr/logging.properties
new file mode 100644
index 000000000..a647fe069
--- /dev/null
+++ b/webapp/config/solr/logging.properties
@@ -0,0 +1,14 @@
+# logging parameters for Solr
+# see http://tomcat.apache.org/tomcat-6.0-doc/logging.html#Using_java.util.logging_%28default%29
+
+handlers = org.apache.juli.FileHandler
+
+############################################################
+# Handler specific properties.
+# Describes specific configuration info for Handlers.
+############################################################
+
+org.apache.juli.FileHandler.level = INFO
+org.apache.juli.FileHandler.directory = ${catalina.base}/logs
+org.apache.juli.FileHandler.prefix = solr.
+org.apache.juli.FileHandler.formatter = java.util.logging.SimpleFormatter