diff --git a/solr/additions-to-solr-war/WEB-INF/classes/log4j.properties b/solr/additions-to-solr-war/WEB-INF/classes/log4j.properties
new file mode 100644
index 000000000..93839409e
--- /dev/null
+++ b/solr/additions-to-solr-war/WEB-INF/classes/log4j.properties
@@ -0,0 +1,13 @@
+log4j.appender.AllAppender=org.apache.log4j.RollingFileAppender 
+log4j.appender.AllAppender.File= ${catalina.home}/logs/solr.log
+log4j.appender.AllAppender.MaxFileSize=10MB 
+log4j.appender.AllAppender.MaxBackupIndex=10 
+log4j.appender.AllAppender.layout=org.apache.log4j.PatternLayout 
+log4j.appender.AllAppender.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c{1}] %m%n
+
+log4j.rootLogger=INFO, AllAppender 
+
+# Make all of the Solr classes quieter...
+log4j.logger.org.apache.solr.level = WARNING
+# ...except for this one.
+log4j.logger.org.apache.solr.core.SolrResourceLoader.level = INFO
diff --git a/solr/solrj-lib/jcl-over-slf4j-1.6.6.jar b/solr/additions-to-solr-war/WEB-INF/lib/jcl-over-slf4j-1.6.1.jar
similarity index 73%
rename from solr/solrj-lib/jcl-over-slf4j-1.6.6.jar
rename to solr/additions-to-solr-war/WEB-INF/lib/jcl-over-slf4j-1.6.1.jar
index ab898c041..79e1ec2ca 100644
Binary files a/solr/solrj-lib/jcl-over-slf4j-1.6.6.jar and b/solr/additions-to-solr-war/WEB-INF/lib/jcl-over-slf4j-1.6.1.jar differ
diff --git a/solr/additions-to-solr-war/WEB-INF/lib/jul-to-slf4j-1.6.1.jar b/solr/additions-to-solr-war/WEB-INF/lib/jul-to-slf4j-1.6.1.jar
new file mode 100644
index 000000000..e240f3b60
Binary files /dev/null and b/solr/additions-to-solr-war/WEB-INF/lib/jul-to-slf4j-1.6.1.jar differ
diff --git a/solr/solrj-lib/log4j-1.2.16.jar b/solr/additions-to-solr-war/WEB-INF/lib/log4j-1.2.16.jar
similarity index 100%
rename from solr/solrj-lib/log4j-1.2.16.jar
rename to solr/additions-to-solr-war/WEB-INF/lib/log4j-1.2.16.jar
diff --git a/solr/additions-to-solr-war/WEB-INF/lib/slf4j-api-1.6.1.jar b/solr/additions-to-solr-war/WEB-INF/lib/slf4j-api-1.6.1.jar
new file mode 100644
index 000000000..42e0ad0de
Binary files /dev/null and b/solr/additions-to-solr-war/WEB-INF/lib/slf4j-api-1.6.1.jar differ
diff --git a/solr/additions-to-solr-war/WEB-INF/lib/slf4j-log4j12-1.6.1.jar b/solr/additions-to-solr-war/WEB-INF/lib/slf4j-log4j12-1.6.1.jar
new file mode 100644
index 000000000..873d11983
Binary files /dev/null and b/solr/additions-to-solr-war/WEB-INF/lib/slf4j-log4j12-1.6.1.jar differ
diff --git a/solr/solrj-lib/commons-io-2.1.jar b/solr/solrj-lib/commons-io-2.1.jar
deleted file mode 100644
index b5c7d692f..000000000
Binary files a/solr/solrj-lib/commons-io-2.1.jar and /dev/null differ
diff --git a/solr/solrj-lib/httpclient-4.3.1.jar b/solr/solrj-lib/httpclient-4.3.1.jar
deleted file mode 100644
index cdd1e3874..000000000
Binary files a/solr/solrj-lib/httpclient-4.3.1.jar and /dev/null differ
diff --git a/solr/solrj-lib/httpcore-4.3.jar b/solr/solrj-lib/httpcore-4.3.jar
deleted file mode 100644
index ddfe6dacb..000000000
Binary files a/solr/solrj-lib/httpcore-4.3.jar and /dev/null differ
diff --git a/solr/solrj-lib/httpmime-4.3.1.jar b/solr/solrj-lib/httpmime-4.3.1.jar
deleted file mode 100644
index 2b26d7a79..000000000
Binary files a/solr/solrj-lib/httpmime-4.3.1.jar and /dev/null differ
diff --git a/solr/solrj-lib/jul-to-slf4j-1.6.6.jar b/solr/solrj-lib/jul-to-slf4j-1.6.6.jar
deleted file mode 100644
index fa8640f16..000000000
Binary files a/solr/solrj-lib/jul-to-slf4j-1.6.6.jar and /dev/null differ
diff --git a/solr/solrj-lib/noggit-0.5.jar b/solr/solrj-lib/noggit-0.5.jar
deleted file mode 100644
index 163ced7cc..000000000
Binary files a/solr/solrj-lib/noggit-0.5.jar and /dev/null differ
diff --git a/solr/solrj-lib/slf4j-api-1.6.6.jar b/solr/solrj-lib/slf4j-api-1.6.6.jar
deleted file mode 100644
index 4c03fa6bb..000000000
Binary files a/solr/solrj-lib/slf4j-api-1.6.6.jar and /dev/null differ
diff --git a/solr/solrj-lib/slf4j-log4j12-1.6.6.jar b/solr/solrj-lib/slf4j-log4j12-1.6.6.jar
deleted file mode 100644
index e72c2d66e..000000000
Binary files a/solr/solrj-lib/slf4j-log4j12-1.6.6.jar and /dev/null differ
diff --git a/solr/solrj-lib/wstx-asl-3.2.7.jar b/solr/solrj-lib/wstx-asl-3.2.7.jar
deleted file mode 100644
index 277701703..000000000
Binary files a/solr/solrj-lib/wstx-asl-3.2.7.jar and /dev/null differ
diff --git a/solr/solrj-lib/zookeeper-3.4.5.jar b/solr/solrj-lib/zookeeper-3.4.5.jar
deleted file mode 100644
index a7966bbbc..000000000
Binary files a/solr/solrj-lib/zookeeper-3.4.5.jar and /dev/null differ
diff --git a/webapp/build.xml b/webapp/build.xml
index 1adf47338..61b2d24e4 100644
--- a/webapp/build.xml
+++ b/webapp/build.xml
@@ -419,10 +419,11 @@
 			<fileset dir="${solr.template.dir}/homeDirectoryTemplate" />
 		</copy>
 
-		<!-- create an unpacked image of the Solr WAR, with our config options -->
+		<!-- create an unpacked image of the Solr WAR -->
 		<unwar src="${solr.template.dir}/solr-4.7.2.war" dest="${solr.webapp.dir}" />
-		<copy todir="${solr.webapp.dir}/WEB-INF/classes">
-			<fileset dir="${appbase.dir}/config/solr/" />
+		<!-- add logging JARs and logging options that Solr doesn't include -->
+		<copy todir="${solr.webapp.dir}">
+			<fileset dir="${solr.template.dir}/additions-to-solr-war/" />
 		</copy>
 	</target>
 
diff --git a/webapp/config/solr/logging.properties b/webapp/config/solr/logging.properties
deleted file mode 100644
index 591e215ab..000000000
--- a/webapp/config/solr/logging.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-############################################################
-# 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
-
-############################################################
-# Special handling for classes that need to be less chatty 
-# than the overall level.
-############################################################
-
-# Make all of the Solr classes quieter...
-org.apache.solr.level = WARNING
-# ...except for this one.
-org.apache.solr.core.SolrResourceLoader.level = INFO