diff --git a/etc/magnum/magnum.conf.sample b/etc/magnum/magnum.conf.sample
index 48b40284ca3fcc098c9f8ae606d8265369d46459..926f26b3542af9994edf90e72b1e3d6b6837b6c6 100644
--- a/etc/magnum/magnum.conf.sample
+++ b/etc/magnum/magnum.conf.sample
@@ -133,7 +133,7 @@
 #rpc_zmq_bind_address = *
 
 # MatchMaker driver. (string value)
-#rpc_zmq_matchmaker = oslo_messaging._drivers.matchmaker.MatchMakerLocalhost
+#rpc_zmq_matchmaker = local
 
 # ZeroMQ receiver listening port. (integer value)
 #rpc_zmq_port = 9501
@@ -881,9 +881,10 @@
 #rabbit_ha_queues = false
 
 # Number of seconds after which the Rabbit broker is considered down
-# if heartbeat's keep-alive fails (0 disable the heartbeat). (integer
-# value)
-#heartbeat_timeout_threshold = 60
+# if heartbeat's keep-alive fails (0 disables the heartbeat, >0
+# enables it. Enabling heartbeats requires kombu>=3.0.7 and
+# amqp>=1.4.0). EXPERIMENTAL (integer value)
+#heartbeat_timeout_threshold = 0
 
 # How often times during the heartbeat_timeout_threshold we check the
 # heartbeat. (integer value)