diff --git a/roles/burp-client/templates/burp.conf.j2 b/roles/burp-client/templates/burp.conf.j2
index 0c472df..ed63eee 100644
--- a/roles/burp-client/templates/burp.conf.j2
+++ b/roles/burp-client/templates/burp.conf.j2
@@ -2,12 +2,20 @@
 
 mode = client
 port = 4971
+# A different port to use for restores - see the man page for more options.
+#port_restore = 5971
+status_port = 4972
 server = {{ burp_server }}
 password = {{ burp_password }}
 cname = {{ burp_cname }}
+# Choose the protocol to use.
+# 0 to decide automatically, 1 to force protocol1 mode (file level granularity
+# with a pseudo mirrored storage on the server and optional rsync). 2 forces
+# protocol2 mode (inline deduplication with variable length blocks).
+# protocol = 0
 pidfile = /var/run/burp.client.pid
 syslog = 1
-stdout = 0
+stdout = 1
 progress_counter = 0
 # Ratelimit throttles the send speed. Specified in Megabits per second (Mb/s).
 # ratelimit = 1.5
@@ -18,6 +26,10 @@ progress_counter = 0
 # initiate a restore.
 server_can_restore = 0
 
+# Set server_can_override_includes to 0 if you do not want the server to be
+# able to override the local include/exclude list. The default is 1.
+# server_can_override_includes = 1
+
 # Set an encryption password if you do not trust the server with your data.
 # Note that this will mean that network deltas will not be possible. Each time
 # a file changes, the whole file will be transferred on the next backup.
@@ -51,13 +63,21 @@ ssl_key = /etc/burp/ssl_cert-client.key
 # Client SSL ciphers
 #ssl_ciphers = 
 
-# SSL key password
+# Client SSL compression. Default is zlib5. Set to zlib0 to turn it off.
+#ssl_compression = zlib5
+
+# SSL key password, for loading a certificate with encryption.
 #ssl_key_password = password
 
 # Common name in the certificate that the server gives us
 ssl_peer_cn = {{ burp_server_cn }}
-{% if burp_backup_script_pre is defined %}
 
+# Example syntax for pre/post scripts
+#backup_script_pre=/path/to/a/script
+#backup_script_post=/path/to/a/script
+#restore_script_pre=/path/to/a/script
+#restore_script_post=/path/to/a/script
+{% if burp_backup_script_pre is defined %}
 backup_script_pre = {{ burp_backup_script_pre }}
 {% if burp_backup_script_pre_args is defined %}
 {% for arg in burp_backup_script_pre_args %}
@@ -66,7 +86,6 @@ backup_script_pre_arg = {{ arg }}
 {% endif %}
 {% endif %}
 {% if burp_backup_script_post is defined %}
-
 backup_script_post = {{ burp_backup_script_post }}
 {% if burp_backup_script_post_args is defined %}
 {% for arg in burp_backup_script_post_args %}
@@ -78,7 +97,7 @@ backup_script_post_run_on_fail = {{ burp_backup_script_post_run_on_fail|d(0) }}
 
 # The following options specify exactly what to backup.
 # The server will override them if there is at least one 'include=' line on
-# the server side.
+# the server side and 'server_can_override_includes=1'.
 #include = /home
 #exclude = /home/graham/testdir/librsync-0.9.7/testsuite
 #include = /home/graham/testdir/librsync-0.9.7/testsuite/deep
@@ -113,7 +132,10 @@ exclude_comp=bz2
 exclude_comp=gz
 # When backing up, whether to enable O_NOATIME when opening files and
 # directories. The default is atime=0, which enables O_NOATIME.
-# atime=1
+#atime=1
+# When enabled, this causes problems in the phase1 scan (such as an 'include'
+# being missing) to be treated as fatal errors. The default is 0.
+#scan_problem_raises_error=1
 
 exclude_regex=lost\+_found
 {% for item in burp_backup %}