diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC
index 17ca352b65bd..dcedd7d76ac7 100644
--- a/sys/alpha/conf/GENERIC
+++ b/sys/alpha/conf/GENERIC
@@ -139,9 +139,8 @@ pseudo-device	ppp	1	# Kernel PPP
 pseudo-device	tun		# Packet tunnel.
 pseudo-device	pty		# Pseudo-ttys (telnet etc)
 pseudo-device	md		# Memory "disks"
-# for IPv6
-pseudo-device	gif	4	#IPv6 and IPv4 tunneling
-pseudo-device	faith	1	#for IPv6 and IPv4 translation
+pseudo-device	gif	4	# IPv6 and IPv4 tunneling
+pseudo-device	faith	1	# IPv6-to-IPv4 relaying/(translation)
 
 # The `bpf' pseudo-device enables the Berkeley Packet Filter.
 # Be aware of the administrative consequences of enabling this!
diff --git a/sys/alpha/conf/NOTES b/sys/alpha/conf/NOTES
index 17ca352b65bd..dcedd7d76ac7 100644
--- a/sys/alpha/conf/NOTES
+++ b/sys/alpha/conf/NOTES
@@ -139,9 +139,8 @@ pseudo-device	ppp	1	# Kernel PPP
 pseudo-device	tun		# Packet tunnel.
 pseudo-device	pty		# Pseudo-ttys (telnet etc)
 pseudo-device	md		# Memory "disks"
-# for IPv6
-pseudo-device	gif	4	#IPv6 and IPv4 tunneling
-pseudo-device	faith	1	#for IPv6 and IPv4 translation
+pseudo-device	gif	4	# IPv6 and IPv4 tunneling
+pseudo-device	faith	1	# IPv6-to-IPv4 relaying/(translation)
 
 # The `bpf' pseudo-device enables the Berkeley Packet Filter.
 # Be aware of the administrative consequences of enabling this!
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 7f83ed6e5104..3967448ff291 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -205,9 +205,8 @@ pseudo-device	ppp	1	# Kernel PPP
 pseudo-device	tun		# Packet tunnel.
 pseudo-device	pty		# Pseudo-ttys (telnet etc)
 pseudo-device	md		# Memory "disks"
-# for IPv6
-pseudo-device	gif	4	#IPv6 and IPv4 tunneling
-pseudo-device	faith	1	#for IPv6 and IPv4 translation
+pseudo-device	gif	4	# IPv6 and IPv4 tunneling
+pseudo-device	faith	1	# IPv6-to-IPv4 relaying (translation)
 
 # The `bpf' pseudo-device enables the Berkeley Packet Filter.
 # Be aware of the administrative consequences of enabling this!
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 7f83ed6e5104..3967448ff291 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -205,9 +205,8 @@ pseudo-device	ppp	1	# Kernel PPP
 pseudo-device	tun		# Packet tunnel.
 pseudo-device	pty		# Pseudo-ttys (telnet etc)
 pseudo-device	md		# Memory "disks"
-# for IPv6
-pseudo-device	gif	4	#IPv6 and IPv4 tunneling
-pseudo-device	faith	1	#for IPv6 and IPv4 translation
+pseudo-device	gif	4	# IPv6 and IPv4 tunneling
+pseudo-device	faith	1	# IPv6-to-IPv4 relaying (translation)
 
 # The `bpf' pseudo-device enables the Berkeley Packet Filter.
 # Be aware of the administrative consequences of enabling this!