diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index fc08e566770f..ccf70f82e905 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -26,7 +26,6 @@ ident		GENERIC
 #hints		"GENERIC.hints"		# Default places to look for devices.
 
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-makeoptions	NO_MODULES=not_yet
 
 options 	SCHED_ULE		# ULE scheduler
 options 	INET			# InterNETworking
diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index 8c9b152eba2f..d3610a60fc0c 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -7,9 +7,6 @@
 # $FreeBSD$
 #
 
-# We don't have modules on amd64.
-makeoptions	NO_MODULES=not_yet
-
 #
 # This directive is mandatory; it defines the architecture to be
 # configured for; in this case, the AMD64 family based machines.