diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 2c04a17b0ee7..60c5e9a99e88 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -29,7 +29,6 @@ maxusers	32
 
 options 	MATH_EMULATE		#Support for x87 emulation
 options 	INET			#InterNETworking
-#options 	"INET6"			#IPv6
 options 	FFS			#Berkeley Fast Filesystem
 options 	FFS_ROOT		#FFS usable as root device [keep this!]
 options 	MFS			#Memory Filesystem
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 51c11826fde3..e5c36620b59e 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -366,6 +366,7 @@ options 	ROOTDEVNAME=\"da0s2e\"
 #  value.
 #
 options 	INET			#Internet communications protocols
+options 	INET6			#IPv6 communications protocols
 
 options 	IPX			#IPX/SPX communications protocols
 options 	IPXIP			#IPX in IP encapsulation (not available)
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 2c04a17b0ee7..60c5e9a99e88 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -29,7 +29,6 @@ maxusers	32
 
 options 	MATH_EMULATE		#Support for x87 emulation
 options 	INET			#InterNETworking
-#options 	"INET6"			#IPv6
 options 	FFS			#Berkeley Fast Filesystem
 options 	FFS_ROOT		#FFS usable as root device [keep this!]
 options 	MFS			#Memory Filesystem
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 51c11826fde3..e5c36620b59e 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -366,6 +366,7 @@ options 	ROOTDEVNAME=\"da0s2e\"
 #  value.
 #
 options 	INET			#Internet communications protocols
+options 	INET6			#IPv6 communications protocols
 
 options 	IPX			#IPX/SPX communications protocols
 options 	IPXIP			#IPX in IP encapsulation (not available)
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 51c11826fde3..e5c36620b59e 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -366,6 +366,7 @@ options 	ROOTDEVNAME=\"da0s2e\"
 #  value.
 #
 options 	INET			#Internet communications protocols
+options 	INET6			#IPv6 communications protocols
 
 options 	IPX			#IPX/SPX communications protocols
 options 	IPXIP			#IPX in IP encapsulation (not available)