diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 66ede1ee2327..436db3a2a37b 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -464,7 +464,6 @@ pseudo-device	disc			#Discard device
 pseudo-device	tun			#Tunnel driver (ppp(8), nos-tun(8))
 pseudo-device	sl	2		#Serial Line IP
 pseudo-device	ppp	2		#Point-to-point protocol
-pseudo-device	streams
 options 	PPP_BSDCOMP		#PPP BSD-compress support
 options 	PPP_DEFLATE		#PPP zlib/deflate/gzip support
 options 	PPP_FILTER		#enable bpf filtering (needs bpf)
@@ -2215,11 +2214,9 @@ options 	CLK_USE_I8254_CALIBRATION
 options 	CLK_USE_TSC_CALIBRATION
 options 	CLUSTERDEBUG
 options 	COMPAT_LINUX
-options		COMPAT_SVR4
 options 	CPU_UPGRADE_HW_CACHE
 options 	DEBUG
 options 	DEBUG_LINUX
-options		DEBUG_SVR4
 options 	DEBUG_VFS_LOCKS
 #options 	DISABLE_PSE
 options 	ENABLE_ALART
@@ -2376,3 +2373,22 @@ makeoptions	UKBD_DFLT_KEYMAP=it.iso
 # An embedded system might want to run something other than init.
 options 	INIT_PATH="/sbin/init:/stand/sysinstall"
 
+#
+# SysVR4 ABI emulation
+#
+# The svr4 ABI emulator can be statically compiled into the kernel or loaded as
+# a KLD module.  
+# The STREAMS network emulation code can also be compiled statically or as a 
+# module.  If loaded as a module, it must be loaded before the svr4 module
+# (the /usr/sbin/svr4 script does this for you).  If compiling statically,
+# the "streams" pseudo-device must be configured into any kernel which also
+# specifies COMPAT_SVR4.  It is possible to have a statically-configured 
+# STREAMS device and a dynamically loadable svr4 emulator;  the /usr/sbin/svr4
+# script understands that it doesn't need to load the "streams" module under
+# those circumstances.
+# Caveat:  At this time, "options KTRACE" is required for the svr4 emulator
+# (whether static or dynamic).  
+# 
+options		COMPAT_SVR4	# build emulator statically
+options		DEBUG_SVR4	# enable verbose debugging
+pseudo-device	streams		# STREAMS network driver (required for svr4).
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 66ede1ee2327..436db3a2a37b 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -464,7 +464,6 @@ pseudo-device	disc			#Discard device
 pseudo-device	tun			#Tunnel driver (ppp(8), nos-tun(8))
 pseudo-device	sl	2		#Serial Line IP
 pseudo-device	ppp	2		#Point-to-point protocol
-pseudo-device	streams
 options 	PPP_BSDCOMP		#PPP BSD-compress support
 options 	PPP_DEFLATE		#PPP zlib/deflate/gzip support
 options 	PPP_FILTER		#enable bpf filtering (needs bpf)
@@ -2215,11 +2214,9 @@ options 	CLK_USE_I8254_CALIBRATION
 options 	CLK_USE_TSC_CALIBRATION
 options 	CLUSTERDEBUG
 options 	COMPAT_LINUX
-options		COMPAT_SVR4
 options 	CPU_UPGRADE_HW_CACHE
 options 	DEBUG
 options 	DEBUG_LINUX
-options		DEBUG_SVR4
 options 	DEBUG_VFS_LOCKS
 #options 	DISABLE_PSE
 options 	ENABLE_ALART
@@ -2376,3 +2373,22 @@ makeoptions	UKBD_DFLT_KEYMAP=it.iso
 # An embedded system might want to run something other than init.
 options 	INIT_PATH="/sbin/init:/stand/sysinstall"
 
+#
+# SysVR4 ABI emulation
+#
+# The svr4 ABI emulator can be statically compiled into the kernel or loaded as
+# a KLD module.  
+# The STREAMS network emulation code can also be compiled statically or as a 
+# module.  If loaded as a module, it must be loaded before the svr4 module
+# (the /usr/sbin/svr4 script does this for you).  If compiling statically,
+# the "streams" pseudo-device must be configured into any kernel which also
+# specifies COMPAT_SVR4.  It is possible to have a statically-configured 
+# STREAMS device and a dynamically loadable svr4 emulator;  the /usr/sbin/svr4
+# script understands that it doesn't need to load the "streams" module under
+# those circumstances.
+# Caveat:  At this time, "options KTRACE" is required for the svr4 emulator
+# (whether static or dynamic).  
+# 
+options		COMPAT_SVR4	# build emulator statically
+options		DEBUG_SVR4	# enable verbose debugging
+pseudo-device	streams		# STREAMS network driver (required for svr4).
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 66ede1ee2327..436db3a2a37b 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -464,7 +464,6 @@ pseudo-device	disc			#Discard device
 pseudo-device	tun			#Tunnel driver (ppp(8), nos-tun(8))
 pseudo-device	sl	2		#Serial Line IP
 pseudo-device	ppp	2		#Point-to-point protocol
-pseudo-device	streams
 options 	PPP_BSDCOMP		#PPP BSD-compress support
 options 	PPP_DEFLATE		#PPP zlib/deflate/gzip support
 options 	PPP_FILTER		#enable bpf filtering (needs bpf)
@@ -2215,11 +2214,9 @@ options 	CLK_USE_I8254_CALIBRATION
 options 	CLK_USE_TSC_CALIBRATION
 options 	CLUSTERDEBUG
 options 	COMPAT_LINUX
-options		COMPAT_SVR4
 options 	CPU_UPGRADE_HW_CACHE
 options 	DEBUG
 options 	DEBUG_LINUX
-options		DEBUG_SVR4
 options 	DEBUG_VFS_LOCKS
 #options 	DISABLE_PSE
 options 	ENABLE_ALART
@@ -2376,3 +2373,22 @@ makeoptions	UKBD_DFLT_KEYMAP=it.iso
 # An embedded system might want to run something other than init.
 options 	INIT_PATH="/sbin/init:/stand/sysinstall"
 
+#
+# SysVR4 ABI emulation
+#
+# The svr4 ABI emulator can be statically compiled into the kernel or loaded as
+# a KLD module.  
+# The STREAMS network emulation code can also be compiled statically or as a 
+# module.  If loaded as a module, it must be loaded before the svr4 module
+# (the /usr/sbin/svr4 script does this for you).  If compiling statically,
+# the "streams" pseudo-device must be configured into any kernel which also
+# specifies COMPAT_SVR4.  It is possible to have a statically-configured 
+# STREAMS device and a dynamically loadable svr4 emulator;  the /usr/sbin/svr4
+# script understands that it doesn't need to load the "streams" module under
+# those circumstances.
+# Caveat:  At this time, "options KTRACE" is required for the svr4 emulator
+# (whether static or dynamic).  
+# 
+options		COMPAT_SVR4	# build emulator statically
+options		DEBUG_SVR4	# enable verbose debugging
+pseudo-device	streams		# STREAMS network driver (required for svr4).