diff --git a/doc/sudoers.man.in b/doc/sudoers.man.in
index 5969d87c8..a412f8a5c 100644
--- a/doc/sudoers.man.in
+++ b/doc/sudoers.man.in
@@ -25,7 +25,7 @@
 .nr BA @BAMAN@
 .nr LC @LCMAN@
 .nr PS @PSMAN@
-.TH "SUDOERS" "@mansectform@" "November 8, 2019" "Sudo @PACKAGE_VERSION@" "File Formats Manual"
+.TH "SUDOERS" "@mansectform@" "November 18, 2019" "Sudo @PACKAGE_VERSION@" "File Formats Manual"
 .nh
 .if n .ad l
 .SH "NAME"
@@ -4471,13 +4471,13 @@ should run
 to get their accustomed editor configuration instead of
 invoking the editor directly.
 .TP 18n
-log_server
+log_servers
 Starting with
 \fBsudo\fR
 1.9, it is possible to send I/O logs to a remote server instead of
 logging them locally.
 The
-\fIlog_server\fR
+\fIlog_servers\fR
 setting specifies one or more server addresses to use when storing
 I/O logs remotely.
 Log servers must be running
@@ -4491,7 +4491,7 @@ The host portion may be a host name, an IPv4 address, or an IPv6 address
 in square brackets.
 .sp
 When
-\fIlog_server\fR
+\fIlog_servers\fR
 is enabled, I/O logs will not be logged locally.
 If no log servers are reachable, the user will not be able
 to run a command unless the
@@ -4927,7 +4927,7 @@ The
 \fIiolog_file\fR
 option may be used to control the format of the session ID.
 For remote logs, the
-\fIlog_server\fR
+\fIlog_servers\fR
 setting is used to specify one or more log servers running
 \fBsudo_logsrvd\fR
 or another server that implements the protocol described by
diff --git a/doc/sudoers.mdoc.in b/doc/sudoers.mdoc.in
index 2ac38eb30..75019db66 100644
--- a/doc/sudoers.mdoc.in
+++ b/doc/sudoers.mdoc.in
@@ -24,7 +24,7 @@
 .nr BA @BAMAN@
 .nr LC @LCMAN@
 .nr PS @PSMAN@
-.Dd November 8, 2019
+.Dd November 18, 2019
 .Dt SUDOERS @mansectform@
 .Os Sudo @PACKAGE_VERSION@
 .Sh NAME
@@ -4172,13 +4172,13 @@ should run
 .Nm sudo Fl e )
 to get their accustomed editor configuration instead of
 invoking the editor directly.
-.It log_server
+.It log_servers
 Starting with
 .Nm sudo
 1.9, it is possible to send I/O logs to a remote server instead of
 logging them locally.
 The
-.Em log_server
+.Em log_servers
 setting specifies one or more server addresses to use when storing
 I/O logs remotely.
 Log servers must be running
@@ -4192,7 +4192,7 @@ The host portion may be a host name, an IPv4 address, or an IPv6 address
 in square brackets.
 .Pp
 When
-.Em log_server
+.Em log_servers
 is enabled, I/O logs will not be logged locally.
 If no log servers are reachable, the user will not be able
 to run a command unless the
@@ -4597,7 +4597,7 @@ The
 .Em iolog_file
 option may be used to control the format of the session ID.
 For remote logs, the
-.Em log_server
+.Em log_servers
 setting is used to specify one or more log servers running
 .Nm sudo_logsrvd
 or another server that implements the protocol described by
diff --git a/plugins/sudoers/def_data.c b/plugins/sudoers/def_data.c
index 00ce8ce5e..5591df209 100644
--- a/plugins/sudoers/def_data.c
+++ b/plugins/sudoers/def_data.c
@@ -506,7 +506,7 @@ struct sudo_defs_types sudo_defs_table[] = {
 	N_("Log when a command is denied by sudoers"),
 	NULL,
     }, {
-	"log_server", T_LIST|T_BOOL,
+	"log_servers", T_LIST|T_BOOL,
 	N_("Sudo log server(s) to connect to with optional port"),
 	NULL,
     }, {
diff --git a/plugins/sudoers/def_data.h b/plugins/sudoers/def_data.h
index bc41e7fc5..c6718aae6 100644
--- a/plugins/sudoers/def_data.h
+++ b/plugins/sudoers/def_data.h
@@ -232,8 +232,8 @@
 #define def_log_allowed         (sudo_defs_table[I_LOG_ALLOWED].sd_un.flag)
 #define I_LOG_DENIED            116
 #define def_log_denied          (sudo_defs_table[I_LOG_DENIED].sd_un.flag)
-#define I_LOG_SERVER            117
-#define def_log_server          (sudo_defs_table[I_LOG_SERVER].sd_un.list)
+#define I_LOG_SERVERS           117
+#define def_log_servers         (sudo_defs_table[I_LOG_SERVERS].sd_un.list)
 #define I_LOG_SERVER_TIMEOUT    118
 #define def_log_server_timeout  (sudo_defs_table[I_LOG_SERVER_TIMEOUT].sd_un.ival)
 
diff --git a/plugins/sudoers/def_data.in b/plugins/sudoers/def_data.in
index 2004b0d7d..37b62f411 100644
--- a/plugins/sudoers/def_data.in
+++ b/plugins/sudoers/def_data.in
@@ -366,7 +366,7 @@ log_allowed
 log_denied
 	T_FLAG
 	"Log when a command is denied by sudoers"
-log_server
+log_servers
 	T_LIST|T_BOOL
 	"Sudo log server(s) to connect to with optional port"
 log_server_timeout
diff --git a/plugins/sudoers/policy.c b/plugins/sudoers/policy.c
index 757bebf49..0593aebb8 100644
--- a/plugins/sudoers/policy.c
+++ b/plugins/sudoers/policy.c
@@ -725,8 +725,8 @@ sudoers_policy_exec_setup(char *argv[], char *envp[], mode_t cmnd_umask,
 	if ((command_info[info_len++] = sudo_new_key_val("iolog_group", def_iolog_group)) == NULL)
 	    goto oom;
     }
-    if (!SLIST_EMPTY(&def_log_server)) {
-	char *log_servers = serialize_list("log_servers", &def_log_server);
+    if (!SLIST_EMPTY(&def_log_servers)) {
+	char *log_servers = serialize_list("log_servers", &def_log_servers);
 	if (log_servers == NULL)
 	    goto oom;
 	command_info[info_len++] = log_servers;