diff --git a/CHANGES.txt b/CHANGES.txt
index 34bf18f8762..193b80c58ab 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -249,6 +249,8 @@ New Features
 
 45. SOLR-521: StopFilterFactory support for "enablePositionIncrements"
     (Walter Ferrara via hossman)
+
+46. SOLR-557: Added SolrCore.getSearchComponents() to return an unmodifiable Map. (gsingers)
     
 Changes in runtime behavior
 
diff --git a/src/java/org/apache/solr/core/SolrCore.java b/src/java/org/apache/solr/core/SolrCore.java
index 66197a3eb68..413560922a1 100644
--- a/src/java/org/apache/solr/core/SolrCore.java
+++ b/src/java/org/apache/solr/core/SolrCore.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Collections;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -599,7 +600,15 @@ public final class SolrCore {
     }
     return component;
   }
-  
+
+  /**
+   * Accessor for all the Search Components
+   * @return An unmodifiable Map of Search Components
+   */
+  public Map<String, SearchComponent> getSearchComponents() {
+    return Collections.unmodifiableMap(searchComponents);
+  }
+
   ////////////////////////////////////////////////////////////////////////////////
   // Update Handler
   ////////////////////////////////////////////////////////////////////////////////