diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC
index 08edc0f390ea..1a649e9acfe0 100644
--- a/sys/alpha/conf/GENERIC
+++ b/sys/alpha/conf/GENERIC
@@ -173,7 +173,6 @@ device		xl		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
 # Pseudo devices.
 device		loop		# Network loopback
 device		mem		# Memory and kernel memory devices
-device		null		# Null and zero devices
 device		random		# Entropy device
 device		ether		# Ethernet support
 device		sl		# Kernel SLIP
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 8c239c4e169a..aea50d5a80f9 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -220,7 +220,6 @@ device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
 device		loop		# Network loopback
 device		mem		# Memory and kernel memory devices
 device		io		# I/O device
-device		null		# Null and zero devices
 device		random		# Entropy device
 device		ether		# Ethernet support
 device		sl		# Kernel SLIP
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index c919e31070a5..42e141b2fb71 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -839,9 +839,6 @@ options 	VFS_AIO
 # Cryptographically secure random number generator; /dev/random
 device		random
 
-# The bit-bucket; /dev/null
-device		null
-
 # The system memory devices; /dev/mem, /dev/kmem
 device		mem
 
diff --git a/sys/conf/files b/sys/conf/files
index b84fdafcc660..559d081c9287 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -585,7 +585,7 @@ dev/my/if_my.c		optional my
 dev/musycc/musycc.c	optional musycc
 dev/nge/if_nge.c	optional nge
 dev/nmdm/nmdm.c		optional nmdm
-dev/null/null.c		optional null
+dev/null/null.c		standard
 dev/patm/if_patm.c	optional patm pci
 dev/patm/if_patm_intr.c	optional patm pci
 dev/patm/if_patm_ioctl.c	optional patm pci
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 2c86355d83c1..34c019360a20 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -242,7 +242,6 @@ device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
 device		loop		# Network loopback
 device		mem		# Memory and kernel memory devices
 device		io		# I/O device
-device		null		# Null and zero devices
 device		random		# Entropy device
 device		ether		# Ethernet support
 device		sl		# Kernel SLIP
diff --git a/sys/ia64/conf/GENERIC b/sys/ia64/conf/GENERIC
index 0e208234a28e..2c6d6c0c0701 100644
--- a/sys/ia64/conf/GENERIC
+++ b/sys/ia64/conf/GENERIC
@@ -139,7 +139,6 @@ device		gif		# IPv6 and IPv4 tunneling
 device		loop		# Network loopback
 device		md		# Memory "disks"
 device		mem		# Memory and kernel memory devices
-device		null		# Null and zero devices
 device		pty		# Pseudo-ttys (telnet etc)
 device		puc		# Multi I/O cards and multi-channel UARTs
 device		random		# Entropy device
diff --git a/sys/ia64/conf/SKI b/sys/ia64/conf/SKI
index f1b3b370c612..ce805e94fe26 100644
--- a/sys/ia64/conf/SKI
+++ b/sys/ia64/conf/SKI
@@ -57,7 +57,6 @@ device		ether		# Ethernet support
 device		loop		# Network loopback
 device		md		# Memory "disks"
 device		mem		# Memory and kernel memory devices
-device		null		# Null and zero devices
 device		pty		# Pseudo-ttys (telnet etc)
 device		random		# Entropy device
 device		tun		# Packet tunnel.
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 938c4c830235..818f0a3334bb 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -151,7 +151,6 @@ SUBDIR=	${_3dfx} \
 	${_nsp} \
 	ntfs \
 	ntfs_iconv \
-	null \
 	nullfs \
 	${_nwfs} \
 	${_oltr} \
diff --git a/sys/modules/null/Makefile b/sys/modules/null/Makefile
deleted file mode 100644
index 5c80fa65770b..000000000000
--- a/sys/modules/null/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../dev/null
-
-KMOD=	null
-SRCS=	null.c
-SRCS+=	bus_if.h device_if.h vnode_if.h
-
-.include <bsd.kmod.mk>
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index 23db02c049dd..c6d10d058db0 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -218,7 +218,6 @@ device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
 # Pseudo devices.
 device		loop		# Network loopback
 device		mem		# Memory and kernel memory devices
-device		null		# Null and zero devices
 device		random		# Entropy device
 device		ether		# Ethernet support
 device		sl		# Kernel SLIP
diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC
index 4a177e6ad4cb..e89b1db62237 100644
--- a/sys/powerpc/conf/GENERIC
+++ b/sys/powerpc/conf/GENERIC
@@ -103,7 +103,6 @@ device 		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
 
 # Pseudo devices.
 device		loop		# Network loopback
-device		null		# Null and zero devices
 device		random		# Entropy device
 device		ether		# Ethernet support
 device		sl		# Kernel SLIP
diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC
index dab8d2efd234..92159bacc73e 100644
--- a/sys/sparc64/conf/GENERIC
+++ b/sys/sparc64/conf/GENERIC
@@ -167,7 +167,6 @@ device		xl		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
 # Pseudo devices.
 device		loop		# Network loopback
 device		mem		# Memory and kernel memory devices
-device		null		# Null and zero devices
 device		random		# Entropy device
 device		ether		# Ethernet support
 device		sl		# Kernel SLIP