diff --git a/README.md b/README.md
index 410070406caa24867e5492e9141cd44bd62bbe80..dd439dda555f2a583ca218871bf8dff87cc2b6be 100644
--- a/README.md
+++ b/README.md
@@ -45,21 +45,22 @@ rsync_server_exclude_compress: "*.gz *.tgz *.zip *.z *.Z *.rpm *.deb *.bz2"
 rsync_server_log_path: /var/log/rsyncd.log
 rsync_server_pid_path: /var/run/rsyncd.pid
 rsync_server_readonly: false
+# rsync_server_timeout: 0  # 0 by default, indicates unlimited.
+# rsync_server_max_connections: 0  # 0 by default, indicates unlimited.
 rsync_server_shares: []
-  # - name: replaceme
-  #   path: /foo/lab/bar-01
-  #   hosts_allow: 10.4.3.15, 172.30.4.0/24, learning-01.cslab.esss.lu.se
-  #   comment: dummy client to be replaced in CS-entry
-  #   read_only: false
-  #   uid: nobody
-  #   gid: 13
-  #   excludes: "lost+found/ test/ .*"
-  #   timeout: 600
-  # - name: client2
-  #   path: /learning/lab/learning-02
-  #   hosts_allow: learning-01.cslab.esss.lu.se learning-02.cslab.esss.lu.se
-
-
+#  - name: replaceme
+#   path: /foo/lab/bar-01
+#   hosts_allow: 10.4.3.15, 172.30.4.0/24, learning-01.cslab.esss.lu.se
+#   comment: dummy client to be replaced in CS-entry
+#   read_only: false
+#   uid: nobody
+#   gid: 13
+#   excludes: "lost+found/ test/ .*"
+#   timeout: 600
+#   max_connections: 10
+# - name: client2
+#   path: /learning/lab/learning-02
+#   hosts_allow: learning-01.cslab.esss.lu.se learning-02.cslab.esss.lu.se
 
 License
 -------
diff --git a/defaults/main.yml b/defaults/main.yml
index 67ff82cc36ed93503508b91e1d7a074e812735d3..20a58739f3c44b993aedb8965f45cc9d9313d9e9 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -9,6 +9,8 @@ rsync_server_exclude_compress: "*.gz *.tgz *.zip *.z *.Z *.rpm *.deb *.bz2"
 rsync_server_log_path: /var/log/rsyncd.log
 rsync_server_pid_path: /var/run/rsyncd.pid
 rsync_server_readonly: false
+# rsync_server_timeout: 0  # 0 by default, indicates unlimited.
+# rsync_server_max_connections: 0  # 0 by default, indicates unlimited.
 rsync_server_shares: []
 #  - name: replaceme
 #   path: /foo/lab/bar-01
@@ -19,6 +21,7 @@ rsync_server_shares: []
 #   gid: 13
 #   excludes: "lost+found/ test/ .*"
 #   timeout: 600
+#   max_connections: 10
 # - name: client2
 #   path: /learning/lab/learning-02
 #   hosts_allow: learning-01.cslab.esss.lu.se learning-02.cslab.esss.lu.se
diff --git a/templates/etc-rsyncd-conf.j2 b/templates/etc-rsyncd-conf.j2
index 7d99d94a75418c143420650e938d7d249777ba58..873e86f5916982f1946f7f148f5f1cc19e971f61 100644
--- a/templates/etc-rsyncd-conf.j2
+++ b/templates/etc-rsyncd-conf.j2
@@ -52,5 +52,8 @@ exclude = {{ share.excludes }}
 {% if share.timeout is defined %}
 timeout = {{ share.timeout }}
 {% endif %}
+{% if share.max_connections is defined %}
+max connections = {{ share.max_connections }}
+{% endif %}
 
 {% endfor %}