diff --git a/agent/conf/agent.properties b/agent/conf/agent.properties
index 5e3c8db0660..e040a7db01f 100644
--- a/agent/conf/agent.properties
+++ b/agent/conf/agent.properties
@@ -17,6 +17,10 @@
 
 # Sample configuration file for CloudStack agent
 
+# The GUID to identify the agent with, this is mandatory!
+# Generate with "uuidgen"
+guid=
+
 #resource= the java class, which agent load to execute
 resource=com.cloud.hypervisor.kvm.resource.LibvirtComputingResource
 
@@ -29,24 +33,36 @@ host=localhost
 #port = The port management server listening on, default is 8250
 port=8250
 
-#pod= The pod, which agent belonged to
+#cluster= The cluster which the agent belongs to
+cluster=default
+
+#pod= The pod which the agent belongs to
 pod=default
 
-#zone= The zone, which agent belonged to
+#zone= The zone which the agent belongs to
 zone=default
 
-#private.network.device= the private nic device 
-# if this is commented, it is autodetected on service startup
-# private.network.device=cloudbr0
-
 #public.network.device= the public nic device
 # if this is commented, it is autodetected on service startup
 # public.network.device=cloudbr0
 
-#guid= a GUID to identify the agent
+#private.network.device= the private nic device
+# if this is commented, it is autodetected on service startup
+# private.network.device=cloudbr1
 
-#vm.migrate.speed set the vm migrate speed, by default, it's the speed of guest network
-#local.storage.path local storage path, by default, it's /var/lib/libvirt/images/
-#cmds.timeout the timeout for time-consuming operations, such create/copy snapshot
+#guest.network.device= the guest nic device
+# if this is commented, the private nic device will be used
 
+# local storage path, by default, it's /var/lib/libvirt/images/
+#local.storage.path=/var/lib/libvirt/images/
 
+# The UUID for the local storage pool, this is mandatory!
+# Generate with "uuidgen"
+local.storage.uuid=
+
+# the timeout for time-consuming operations, such as create/copy snapshot
+#cmds.timeout=7200
+
+# set the vm migrate speed, by default, it will try to guess the speed of the guest network
+# In MegaBytes per second
+#vm.migrate.speed=0