diff --git a/ChangeLog b/ChangeLog
index 228a532..c5f21a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
 changes since 1.7.2
+	New features:
+	- Autodetect status-server capability of servers
+	- Minimalistic status-server
+
 	Misc:
 	- No longer require docbook2x tools, but include plain manpages
 	- Fail on startup if overlapping clients with different tls blocks
diff --git a/radsecproxy.conf.5 b/radsecproxy.conf.5
index 1916f1e..ff3ca73 100644
--- a/radsecproxy.conf.5
+++ b/radsecproxy.conf.5
@@ -543,13 +543,18 @@ for the realm and then the SRV records for each NAPTR matching
 \&'x-eduroam:radius.tls' is provided in \fItools/naptr\-eduroam.sh\fR.
 .RE
 
-.BR "StatusServer (" on | off )
-.RS
-Enable the use of status-server messages for this server (default off).  If
-statusserver is enabled, the proxy will send regular status-server messages to
-the server to verify that it is alive. Status tracking of the server will solely
-depend on status-server message and ignore lost requests. This should only be
-enabled if the server supports it.
+.BR "StatusServer (" on | off | minimal | auto )
+.RS
+Enable the use of status-server messages for this server (default \fBoff\fR).  If
+statusserver is enabled (\fBon\fR), the proxy will send regular status-server
+messages to the server to verify that it is alive. Status tracking of the server
+will solely depend on status-server message and ignore lost requests. This
+should only be enabled if the server supports it. With the option \fBminimal\fR
+status-server messages are only sent when regular requests have been lost and no
+other replies have been received.
+
+The option \fBauto\fR tries to detect whether the other server supports
+status-server. If so, status-server messages are enabled in \fBminimal\fR mode.
 .RE
 
 .BI "RetryCount " count