diff --git a/ChangeLog b/ChangeLog
index 9d64715..572e360 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,7 @@ Version 4.5.2 'dan Eider':
 		* support of --acme-redirect <URL>
 	- Disable binding request logging to avoid DoS attacks. (Breaking change!)
 		* Add new --log-binding option to enable binding request logging
+	- Fix stale-nonce documentation. Resolves #604
 
 24/06/2020 Oleg Moskalenko <mom040267@gmail.com> Mihály Mészáros <misi@majd.eu>
 Version 4.5.1.3 'dan Eider':
diff --git a/README.turnserver b/README.turnserver
index 46e3bbc..ba3ad28 100644
--- a/README.turnserver
+++ b/README.turnserver
@@ -281,6 +281,7 @@ Options with values:
 
 --stale-nonce[=<value>]		Use extra security with nonce value having
 							limited lifetime, in seconds (default 600 secs).
+							Set it to 0 for unlimited nonce lifetime.
 
 --max-allocate-lifetime		Set the maximum value for the allocation lifetime.
 							Default to 3600 secs.
diff --git a/docker/coturn/turnserver.conf b/docker/coturn/turnserver.conf
index fc9ac1f..ea40824 100644
--- a/docker/coturn/turnserver.conf
+++ b/docker/coturn/turnserver.conf
@@ -411,9 +411,9 @@ realm=example.org
 
 # Uncomment if extra security is desired,
 # with nonce value having a limited lifetime.
-# By default, the nonce value is unique for a session,
-# and has an unlimited lifetime.
+# The nonce value is unique for a session.
 # Set this option to limit the nonce lifetime.
+# Set it to 0 for unlimited lifetime.
 # It defaults to 600 secs (10 min) if no value is provided. After that delay,
 # the client will get 438 error and will have to re-authenticate itself.
 #
diff --git a/examples/etc/turnserver.conf b/examples/etc/turnserver.conf
index d5e39ea..b01fb05 100644
--- a/examples/etc/turnserver.conf
+++ b/examples/etc/turnserver.conf
@@ -423,9 +423,9 @@
 
 # Uncomment if extra security is desired,
 # with nonce value having a limited lifetime.
-# By default, the nonce value is unique for a session,
-# and has an unlimited lifetime.
+# The nonce value is unique for a session.
 # Set this option to limit the nonce lifetime.
+# Set it to 0 for unlimited lifetime.
 # It defaults to 600 secs (10 min) if no value is provided. After that delay,
 # the client will get 438 error and will have to re-authenticate itself.
 #
diff --git a/man/man1/turnserver.1 b/man/man1/turnserver.1
index 9286e01..02bfd5d 100644
--- a/man/man1/turnserver.1
+++ b/man/man1/turnserver.1
@@ -427,6 +427,7 @@ Options with values:
 \fB\-\-stale\-nonce\fP[=<value>]
 Use extra security with nonce value having
 limited lifetime, in seconds (default 600 secs).
+Set it to 0 for unlimited nonce lifetime.
 .TP
 .B
 \fB\-\-max\-allocate\-lifetime\fP