diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index f4fac9ba7727..da4c3ed7a27a 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -494,6 +494,7 @@ svr4_enable="NO"	# SysVR4 emulation loaded at startup (or NO).
 
 osf1_enable="NO"	# Alpha OSF/1 emulation loaded at startup (or NO).
 clear_tmp_enable="NO"	# Clear /tmp at startup.
+clear_tmp_X="YES" 	# Clear and recreate X11-related directories in /tmp
 ldconfig_insecure="NO"	# Set to YES to disable ldconfig security checks
 ldconfig_paths="/usr/lib/compat /usr/X11R6/lib /usr/local/lib /usr/local/lib/compat/pkg"
 			# shared library search paths
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index 61f4d1e11018..0c784bc9bc25 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 19, 2005
+.Dd December 20, 2005
 .Dt RC.CONF 5
 .Os
 .Sh NAME
@@ -2799,6 +2799,14 @@ Set to
 to have
 .Pa /tmp
 cleaned at startup.
+.It Va clear_tmp_X
+.Pq Vt bool
+Set to
+.Dq Li NO
+to disable removing of X11 lock files,
+and the removal and (secure) recreation
+of the various socket directories for X11
+related programs.
 .It Va ldconfig_paths
 .Pq Vt str
 Set to the list of shared library paths to use with