diff --git a/solr/example/solr/conf/solrconfig.xml b/solr/example/solr/conf/solrconfig.xml
index 787b078c119..5f66ae8bc60 100755
--- a/solr/example/solr/conf/solrconfig.xml
+++ b/solr/example/solr/conf/solrconfig.xml
@@ -1261,13 +1261,8 @@
 
        http://wiki.apache.org/solr/ClusteringComponent
 
-       You'll need to set the solr.cluster.enabled system property 
-       when running solr to run with clustering enabled:
-
-       java -Dsolr.clustering.enabled=true -jar start.jar
     -->
-  <searchComponent name="clustering" 
-                   enable="${solr.clustering.enabled:false}"
+  <searchComponent name="clustering"
                    class="solr.clustering.ClusteringComponent" >
     <!-- Declare an engine -->
     <lst name="engine">
@@ -1333,7 +1328,6 @@
     -->
   <requestHandler name="/clustering"
                   startup="lazy"
-                  enable="${solr.clustering.enabled:false}"
                   class="solr.SearchHandler">
     <lst name="defaults">
       <bool name="clustering">true</bool>
diff --git a/solr/example/solr/conf/velocity/cluster.vm b/solr/example/solr/conf/velocity/cluster.vm
index ab2f0e458eb..c798e6a8d12 100644
--- a/solr/example/solr/conf/velocity/cluster.vm
+++ b/solr/example/solr/conf/velocity/cluster.vm
@@ -1,6 +1,6 @@
 <h2 #annTitle("Clusters generated by Carrot2 using the /clustering RequestHandler")>Clusters</h2>
 <div id="clusters">
-  Run Solr with java -Dsolr.clustering.enabled=true -jar start.jar to see results
+  Loading clusters...
 </div>
 <script type="text/javascript">