diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index e8463fd7f43..fc14ba1a581 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -122,6 +122,7 @@ device		ses		# SCSI Environmental Services (and SAF-TE)
 
 # RAID controllers interfaced to the SCSI subsystem
 device		amr		# AMI MegaRAID
+device		arcmsr		# Areca SATA II RAID
 device		ciss		# Compaq Smart RAID 5*
 device		dpt		# DPT Smartcache III, IV - See NOTES for options
 device		iir		# Intel Integrated RAID
diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index a83ce1685c2..030126179e6 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -254,6 +254,12 @@ device		wlan		# 802.11 layer
 #XXX this stores pointers in a 32bit field that is defined by the hardware
 #device	pst
 
+#
+# Areca 11xx and 12xx series of SATA II RAID controllers.
+# CAM is required.
+#
+device		arcmsr		# Areca SATA II RAID
+
 #
 # 3ware 9000 series PATA/SATA RAID controller driver and options.
 # The driver is implemented as a SIM, and so, needs the CAM infrastructure.
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index ae503803713..8b498859746 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -131,6 +131,7 @@ crypto/des/des_enc.c		optional	ipsec ipsec_esp
 crypto/des/des_enc.c		optional	netsmbcrypto
 crypto/des/des_setkey.c		optional	netsmbcrypto
 dev/acpica/acpi_if.m		standard
+dev/arcmsr/arcmsr.c		optional	pci
 dev/fb/fb.c			optional	fb
 dev/fb/fb.c			optional	vga
 dev/fb/splash.c			optional	splash
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index e986e8979e0..aad236488b4 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -137,6 +137,7 @@ crypto/des/des_ecb.c		optional crypto
 crypto/des/des_setkey.c		optional crypto
 dev/advansys/adv_isa.c		optional adv isa
 dev/aic/aic_isa.c		optional aic isa
+dev/arcmsr/arcmsr.c		optional arcmsr pci
 dev/ar/if_ar.c			optional ar
 dev/ar/if_ar_isa.c		optional ar isa
 dev/ar/if_ar_pci.c		optional ar pci
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 59ae8ab79f8..644effcef7d 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -125,6 +125,7 @@ device		ses		# SCSI Environmental Services (and SAF-TE)
 
 # RAID controllers interfaced to the SCSI subsystem
 device		amr		# AMI MegaRAID
+device		arcmsr		# Areca SATA II RAID
 device		asr		# DPT SmartRAID V, VI and Adaptec SCSI RAID
 device		ciss		# Compaq Smart RAID 5*
 device		dpt		# DPT Smartcache III, IV - See NOTES for options
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index f8c043f07b4..e90526ed4df 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -596,6 +596,12 @@ device		ath_rate_onoe	# Onoe rate control for ath driver
 #
 device		pst
 
+#
+# Areca 11xx and 12xx series of SATA II RAID controllers.
+# CAM is required.
+#
+device		arcmsr		# Areca SATA II RAID
+
 #
 # 3ware 9000 series PATA/SATA RAID controller driver and options.
 # The driver is implemented as a SIM, and so, needs the CAM infrastructure.
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index deb74b4002e..c48763d6f7d 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -20,6 +20,7 @@ SUBDIR=	${_3dfx} \
 	${_aout} \
 	${_apm} \
 	${_ar} \
+	${_arcmsr} \
 	${_arcnet} \
 	${_arl} \
 	${_asr} \
@@ -306,6 +307,7 @@ _amd=		amd
 _aout=		aout
 _apm=		apm
 _ar=		ar
+_arcmsr=	arcmsr
 _arcnet=	arcnet
 _ath_hal=	ath_hal
 _awi=		awi
@@ -406,6 +408,7 @@ _sppp=		sppp
 _aac=		aac
 #_acpi=		acpi		# doesn't work on amd64 yet
 _agp=		agp
+_arcmsr=	arcmsr
 _ciss=		ciss
 _cpufreq=	cpufreq
 _digi=		digi