diff --git a/CHANGES.txt b/CHANGES.txt
index 486893f53bd..b9a73c4aac6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -426,6 +426,10 @@ Bug Fixes
 
 34. SOLR-590: Limitation in pgrep on Linux platform breaks script-utils fixUser.    (Hannes Schmidt via billa)
 
+35. SOLR-597: SolrServlet no longer "caches" SolrCore.  This was causing
+    problems in Resin, and could potentially cause problems for customized
+    usages of SolrServlet.
+
 Other Changes
  1. SOLR-135: Moved common classes to org.apache.solr.common and altered the
     build scripts to make two jars: apache-solr-1.3.jar and 
diff --git a/src/webapp/src/org/apache/solr/servlet/SolrServlet.java b/src/webapp/src/org/apache/solr/servlet/SolrServlet.java
index 276b7b0dee1..d5ac36ba531 100644
--- a/src/webapp/src/org/apache/solr/servlet/SolrServlet.java
+++ b/src/webapp/src/org/apache/solr/servlet/SolrServlet.java
@@ -39,11 +39,11 @@ import org.apache.solr.request.SolrRequestHandler;
 public class SolrServlet extends HttpServlet {
     
   final Logger log = Logger.getLogger(SolrServlet.class.getName());
-  SolrCore core;
     
   public void init() throws ServletException {
     log.info("SolrServlet.init()");
-    core = SolrCore.getSolrCore();
+    // we deliberately do not initialize a SolrCore because of SOLR-597
+    // https://issues.apache.org/jira/browse/SOLR-597
     log.info("SolrServlet.init() done");
   }
 
@@ -52,6 +52,7 @@ public class SolrServlet extends HttpServlet {
   }
 
   public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+    final SolrCore core = SolrCore.getSolrCore();
     SolrServletRequest solrReq = new SolrServletRequest(core, request);;
     SolrQueryResponse solrRsp = new SolrQueryResponse();
     try {