diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC
index 8ebf11d5fe4..cd6ee04db09 100644
--- a/sys/alpha/conf/GENERIC
+++ b/sys/alpha/conf/GENERIC
@@ -101,10 +101,12 @@ device		sym		# NCR/Symbios Logic (newer chipsets + those of `ncr')
 
 # SCSI peripherals
 device		scbus		# SCSI bus (required)
+device		ch		# SCSI media changers
 device		da		# Direct Access (disks)
 device		sa		# Sequential Access (tape etc)
 device		cd		# CD
 device		pass		# Passthrough device (direct SCSI access)
+device		ses		# SCSI Environmental Services (and SAF-TE)
 
 # RAID controllers
 device		amr		# AMI MegaRAID
diff --git a/sys/alpha/conf/NOTES b/sys/alpha/conf/NOTES
index 8ebf11d5fe4..cd6ee04db09 100644
--- a/sys/alpha/conf/NOTES
+++ b/sys/alpha/conf/NOTES
@@ -101,10 +101,12 @@ device		sym		# NCR/Symbios Logic (newer chipsets + those of `ncr')
 
 # SCSI peripherals
 device		scbus		# SCSI bus (required)
+device		ch		# SCSI media changers
 device		da		# Direct Access (disks)
 device		sa		# Sequential Access (tape etc)
 device		cd		# CD
 device		pass		# Passthrough device (direct SCSI access)
+device		ses		# SCSI Environmental Services (and SAF-TE)
 
 # RAID controllers
 device		amr		# AMI MegaRAID
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 7e7aa93c83f..909fd872c05 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -104,10 +104,12 @@ device		mly		# Mylex AcceleRAID/eXtremeRAID
 
 # SCSI peripherals
 device		scbus		# SCSI bus (required)
+device		ch		# SCSI media changers
 device		da		# Direct Access (disks)
 device		sa		# Sequential Access (tape etc)
 device		cd		# CD
 device		pass		# Passthrough device (direct SCSI access)
+device		ses		# SCSI Environmental Services (and SAF-TE)
 
 # RAID controllers
 device		aac		# Adaptec FSA RAID
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 7e7aa93c83f..909fd872c05 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -104,10 +104,12 @@ device		mly		# Mylex AcceleRAID/eXtremeRAID
 
 # SCSI peripherals
 device		scbus		# SCSI bus (required)
+device		ch		# SCSI media changers
 device		da		# Direct Access (disks)
 device		sa		# Sequential Access (tape etc)
 device		cd		# CD
 device		pass		# Passthrough device (direct SCSI access)
+device		ses		# SCSI Environmental Services (and SAF-TE)
 
 # RAID controllers
 device		aac		# Adaptec FSA RAID
diff --git a/sys/ia64/conf/GENERIC b/sys/ia64/conf/GENERIC
index 3f1994b2495..b5f47eb7de6 100644
--- a/sys/ia64/conf/GENERIC
+++ b/sys/ia64/conf/GENERIC
@@ -83,10 +83,12 @@ device		sym		# NCR/Symbios Logic (newer chipsets + those of `ncr')
 
 # SCSI peripherals
 device		scbus		# SCSI bus (required)
+device		ch		# SCSI media changers
 device		da		# Direct Access (disks)
 device		sa		# Sequential Access (tape etc)
 device		cd		# CD
 device		pass		# Passthrough device (direct SCSI access)
+device		ses		# SCSI Environmental Services (and SAF-TE)
 
 # RAID controllers
 device		amr		# AMI MegaRAID
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index b4e7d2c8e28..3a6aa60a4ed 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -103,10 +103,12 @@ device		stg		# TMC 18C30/18C50
 
 # SCSI peripherals
 device		scbus		# SCSI bus (required)
+device		ch		# SCSI media changers
 device		da		# Direct Access (disks)
 device		sa		# Sequential Access (tape etc)
 device		cd		# CD
 device		pass		# Passthrough device (direct SCSI access)
+device		ses		# SCSI Environmental Services (and SAF-TE)
 
 # keyboard driver
 device		pckbd	1	# at keyboard