diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 9bab6668c8f..68eca5f3526 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -453,6 +453,7 @@ device		lmc	# tulip based LanMedia WAN cards
 #  IPv6 over IPv6 tunneling.
 #  The `faith' device captures packets sent to it and diverts them
 #  to the IPv4/IPv6 translation daemon.
+#  The `stf' device implements 6to4 encapsulation.
 #  The `ef' device provides support for multiple ethernet frame types
 #  specified via ETHER_* options. See ef(4) for details.
 #
@@ -486,6 +487,7 @@ options 	ETHER_SNAP		# enable Ethernet_802.2/SNAP frame
 # for IPv6
 device		gif	4		#IPv6 and IPv4 tunneling
 device		faith	1		#for IPv6 and IPv4 translation
+device		stf			#6to4 IPv6 over IPv4 encapsulation
 
 #
 # Internet family options:
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 9bab6668c8f..68eca5f3526 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -453,6 +453,7 @@ device		lmc	# tulip based LanMedia WAN cards
 #  IPv6 over IPv6 tunneling.
 #  The `faith' device captures packets sent to it and diverts them
 #  to the IPv4/IPv6 translation daemon.
+#  The `stf' device implements 6to4 encapsulation.
 #  The `ef' device provides support for multiple ethernet frame types
 #  specified via ETHER_* options. See ef(4) for details.
 #
@@ -486,6 +487,7 @@ options 	ETHER_SNAP		# enable Ethernet_802.2/SNAP frame
 # for IPv6
 device		gif	4		#IPv6 and IPv4 tunneling
 device		faith	1		#for IPv6 and IPv4 translation
+device		stf			#6to4 IPv6 over IPv4 encapsulation
 
 #
 # Internet family options: