diff --git a/include/meson.build b/include/meson.build
index 216744ca2..d6ec0d7cd 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -90,6 +90,7 @@ conf_data.set_quoted('SYSCONFDIR', join_paths(get_option('prefix'), get_option('
 conf_data.set('XORG_VERSION_CURRENT', release)
 
 conf_data.set('HASXDMAUTH', get_option('xdm-auth-1'))
+conf_data.set('SECURE_RPC', get_option('secure-rpc'))
 
 conf_data.set('HAVE_DBM_H', cc.has_header('dbm.h'))
 conf_data.set('HAVE_DLFCN_H', cc.has_header('dlfcn.h'))
diff --git a/meson_options.txt b/meson_options.txt
index d1341ede2..294279a5d 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -25,6 +25,7 @@ option('module_dir', type: 'string',
 option('glx', type: 'boolean', value: true)
 option('xdmcp', type: 'boolean', value: true)
 option('xdm-auth-1', type: 'boolean', value: true)
+option('secure-rpc', type: 'boolean', value: true)
 option('ipv6', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto')
 
 option('xkb_dir', type: 'string')
diff --git a/os/meson.build b/os/meson.build
index 940c6f4d0..54124d32a 100644
--- a/os/meson.build
+++ b/os/meson.build
@@ -54,6 +54,10 @@ if get_option('xdmcp')
     srcs_os += 'xdmcp.c'
 endif
 
+if get_option('secure-rpc')
+    srcs_os += 'rpcauth.c'
+endif
+
 libxlibc = []
 if srcs_libc.length() > 0
     libxlibc = static_library('libxlibc',