diff --git a/sys/conf/files b/sys/conf/files
index 634aa23a751d..2de3b88dfb9d 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1965,6 +1965,8 @@ dev/nand/nandsim_ctrl.c		optional nandsim nand
 dev/nand/nandsim_log.c		optional nandsim nand
 dev/nand/nandsim_swap.c		optional nandsim nand
 dev/nand/nfc_if.m		optional nand
+dev/ncr/ncr.c			optional ncr pci \
+	compile-with "${NORMAL_C} -Wno-unused"
 dev/ncv/ncr53c500.c		optional ncv
 dev/ncv/ncr53c500_pccard.c	optional ncv pccard
 dev/netmap/netmap.c		optional netmap
@@ -3868,8 +3870,6 @@ pci/alpm.c			optional alpm pci
 pci/amdpm.c			optional amdpm pci | nfpm pci
 pci/amdsmb.c			optional amdsmb pci
 pci/intpm.c			optional intpm pci
-pci/ncr.c			optional ncr pci \
-	compile-with "${NORMAL_C} -Wno-unused"
 pci/nfsmb.c			optional nfsmb pci
 pci/viapm.c			optional viapm pci
 rpc/auth_none.c			optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd
diff --git a/sys/conf/options b/sys/conf/options
index eff8a120d729..42113c35bd3e 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -363,7 +363,7 @@ SYM_SETUP_PCI_PARITY	opt_sym.h	#-PCI parity checking
 SYM_SETUP_MAX_LUN	opt_sym.h	#-Number of LUNs supported
 					# default:8, range:[1..64]
 
-# Options used only in pci/ncr.c
+# Options used only in dev/ncr/*
 SCSI_NCR_DEBUG		opt_ncr.h
 SCSI_NCR_MAX_SYNC	opt_ncr.h
 SCSI_NCR_MAX_WIDE	opt_ncr.h
diff --git a/sys/pci/locate.pl b/sys/dev/ncr/locate.pl
similarity index 100%
rename from sys/pci/locate.pl
rename to sys/dev/ncr/locate.pl
diff --git a/sys/pci/ncr.c b/sys/dev/ncr/ncr.c
similarity index 99%
rename from sys/pci/ncr.c
rename to sys/dev/ncr/ncr.c
index d13769cc6313..9c015ae76264 100644
--- a/sys/pci/ncr.c
+++ b/sys/dev/ncr/ncr.c
@@ -197,7 +197,7 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
-#include <pci/ncrreg.h>
+#include <dev/ncr/ncrreg.h>
 
 #include <cam/cam.h>
 #include <cam/cam_ccb.h>
diff --git a/sys/pci/ncrreg.h b/sys/dev/ncr/ncrreg.h
similarity index 100%
rename from sys/pci/ncrreg.h
rename to sys/dev/ncr/ncrreg.h
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 50e437148b8d..0514ee236114 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -242,7 +242,7 @@ SUBDIR=	\
 	my \
 	${_nandfs} \
 	${_nandsim} \
-	${_ncp} \
+	${_ncr} \
 	${_ncv} \
 	${_ndis} \
 	netfpga10g \
@@ -537,6 +537,7 @@ _mlx4ib=	mlx4ib
 _mlxen=		mlxen
 _mthca=		mthca
 .endif
+_ncr=		ncr
 _ncv=		ncv
 _ndis=		ndis
 _nsp=		nsp
diff --git a/sys/modules/ncr/Makefile b/sys/modules/ncr/Makefile
new file mode 100644
index 000000000000..52fd88ebec5f
--- /dev/null
+++ b/sys/modules/ncr/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../dev/ncr
+
+KMOD=	ncr
+SRCS=	ncr.c
+SRCS+=	device_if.h bus_if.h pci_if.h opt_ncr.h opt_cam.h
+
+.include <bsd.kmod.mk>
+
+CFLAGS+=-Wno-error=unused-const-variable