diff --git a/assembly/src/release/conf/activemq.xml b/assembly/src/release/conf/activemq.xml
index 9f70416de0..d02f773664 100755
--- a/assembly/src/release/conf/activemq.xml
+++ b/assembly/src/release/conf/activemq.xml
@@ -2,6 +2,18 @@
 <beans xmlns="http://activemq.org/config/1.0">
   
   <broker useJmx="true">
+  
+    <!--  Use the following to set the broker memory limit (in bytes)
+  	<memoryManager>  
+	  	<usageManager id="memory-manager" limit="1048576"/>
+  	</memoryManager>
+  	-->
+  	
+	<!-- Use the following to configure how ActiveMQ is exposed in JMX
+	<managementContext>
+	   <managementContext connectorPort="1099" jmxDomainName="org.apache.activemq"/>
+	</managementContext>
+	-->
 
 	<!-- In ActiveMQ 4, you can setup destination policies -->  
     <destinationPolicy>
@@ -36,8 +48,8 @@
     <networkConnectors>
       <!-- by default just auto discover the other brokers -->
       <networkConnector name="default" uri="multicast://default"/>
-      <!--  
-      <networkConnector name="host1 and host2" uri="static://(tcp://host1:61616,tcp://host2:61616)"/>
+      <!--
+      <networkConnector name="host1 and host2" uri="static://(tcp://host1:61616,tcp://host2:61616)" failover="true"/>
       -->
     </networkConnectors>