diff --git a/distrib/sets/lists/minix-base/md.evbarm b/distrib/sets/lists/minix-base/md.evbarm
index d116e1b0a..ddb43e324 100644
--- a/distrib/sets/lists/minix-base/md.evbarm
+++ b/distrib/sets/lists/minix-base/md.evbarm
@@ -7,7 +7,12 @@
 #
 ./etc/rc.capes                                          minix-base
 ./etc/rc.capes/BB-BONE-WTHR-01                          minix-base
+./etc/system.conf.d/bmp085                              minix-base
+./etc/system.conf.d/gpio                                minix-base
+./etc/system.conf.d/i2c                                 minix-base
 ./etc/system.conf.d/lan8710a                            minix-base
+./etc/system.conf.d/sht21                               minix-base
+./etc/system.conf.d/tsl2550                             minix-base
 ./etc/system.conf.d/usbd                                minix-base
 ./service/bmp085                                        minix-base
 ./service/cat24c256                                     minix-base
diff --git a/distrib/sets/lists/minix-base/md.i386 b/distrib/sets/lists/minix-base/md.i386
index 2b1998e07..b7502b904 100644
--- a/distrib/sets/lists/minix-base/md.i386
+++ b/distrib/sets/lists/minix-base/md.i386
@@ -6,13 +6,26 @@
 # mv out mi
 #
 ./etc/system.conf.d/3c90x                               minix-base
+./etc/system.conf.d/amddev                              minix-base
 ./etc/system.conf.d/atl2                                minix-base
 ./etc/system.conf.d/dec21140A                           minix-base
+./etc/system.conf.d/dp8390                              minix-base
+./etc/system.conf.d/dpeth                               minix-base
+./etc/system.conf.d/es1370                              minix-base
+./etc/system.conf.d/es1371                              minix-base
 ./etc/system.conf.d/e1000                               minix-base
 ./etc/system.conf.d/fxp                                 minix-base
+./etc/system.conf.d/hello                               minix-base
+./etc/system.conf.d/inet                                minix-base
 ./etc/system.conf.d/lance                               minix-base
+./etc/system.conf.d/lwip                                minix-base
+./etc/system.conf.d/printer                             minix-base
+./etc/system.conf.d/random                              minix-base
 ./etc/system.conf.d/rtl8139                             minix-base
 ./etc/system.conf.d/rtl8169                             minix-base
+./etc/system.conf.d/ti1225                              minix-base
+./etc/system.conf.d/vbfs                                minix-base
+./etc/system.conf.d/vbox                                minix-base
 ./etc/system.conf.d/virtio_net                          minix-base
 ./service/3c90x                                         minix-base
 ./service/acpi                                          minix-base
diff --git a/etc/system.conf b/etc/system.conf
index 3df3e0ea1..5996ebce8 100644
--- a/etc/system.conf
+++ b/etc/system.conf
@@ -256,44 +256,6 @@ service floppy
 		;
 };
 
-service dp8390
-{
-	system
-		IRQCTL		# 19
-		DEVIO		# 21
-		SDEVIO		# 22
-	;
-	pci device	10ec:8029;
-	io
-		300:20
-	;
-	irq	9;
-};
-
-service dpeth
-{
-	system
-		IRQCTL		# 19
-		DEVIO		# 21
-		SDEVIO		# 22
-	;
-	uid	0;
-};
-
-service inet
-{
-	uid 0;
-};
-
-service lwip
-{
-	uid 0;
-};
-
-service random
-{
-};
-
 service readclock.drv
 {
 	ipc	ALL;
@@ -335,6 +297,11 @@ service pci
 		PRIVCTL		#  4
 		DEVIO		# 21
 	;
+	ipc
+		acpi
+		ipc
+		acpi
+	;
 	uid 0;
 };
 
@@ -426,96 +393,6 @@ service hgfs
 	;
 };
 
-service vbfs
-{
-	ipc
-		SYSTEM pm vfs rs ds vm vbox
-	;
-	vm
-		SETCACHEPAGE
-		CLEARCACHE
-	;
-};
-
-service printer
-{
-       io      378:4           # LPT1
-               278:4           # LPT2
-       ;
-       irq
-               7               # PRINTER_IRQ
-       ;
-       system
-		KILL            #  6
-		UMAP            # 14
-		IRQCTL          # 19
-		DEVIO           # 21
-		VDEVIO          # 23
-		READBIOS	# 35
-       ;
-};
-
-service es1370
-{
-	system
-		UMAP		# 14
-		IRQCTL          # 19
-		DEVIO           # 21
-	;
-	pci device 1274:5000;
-};
-
-service es1371
-{
-	system
-		UMAP            # 14
-		IRQCTL          # 19
-		DEVIO           # 21
-	;
-	pci device 1274:1371;
-};
-
-service ti1225
-{
-	system
-		IRQCTL		# 19
-	;
-	pci device	104c:ac1c;
-};
-
-service amddev
-{
-	pci device	1022:1103;
-	system
-		UMAP_REMOTE	# 17
-	;
-	vm
-		ADDDMA		# 12
-		DELDMA		# 13
-		GETDMA		# 14
-	;
-	uid	0;
-};
-
-service osscore
-{
-	system
-		PRIVCTL		#  4
-		UMAP		# 14
-		IRQCTL		# 19
-		DEVIO		# 21
-		SDEVIO		# 22
-	;
-	pci class
-		4/1		# Multimedia / Audio device
-	;
-	ipc
-		SYSTEM pm rs tty ds vfs vm
-		pci inet lwip amddev
-		;
-	uid     0;
-};
-
 service filter
 {
 	ipc
@@ -584,54 +461,6 @@ service fb
 	;
 };
 
-service gpio
-{
-	system
-		PRIVCTL		#  4
-		IRQCTL          # 19
-		PADCONF		# 57
-	;
-	vm
-		SETCACHEPAGE
-		CLEARCACHE
-	;
-	irq
-		29	# GPIO module 1 (dm37xx)
-		30	# GPIO module 2 (dm37xx)
-		31	# GPIO module 3 (dm37xx)
-		32	# GPIO module 4 (dm37xx) / module 2a (am335x)
-		33	# GPIO module 5 (dm37xx) / module 2b (am335x)
-		34	# GPIO module 6 (dm37xx)
-		62	# GPIO module 3a (am335x)
-		63	# GPIO module 3b (am335x)
-		96	# GPIO module 0a (am335x)
-		97	# GPIO module 0b (am335x)
-		98	# GPIO module 1a (am335x)
-		99	# GPIO module 1b (am335x)
-	;
-
-};
-
-service i2c
-{
-	system
-		PRIVCTL		#  4
-		IRQCTL          # 19
-		PADCONF		# 57
-	;
-	irq
-		# DM37XX (BeagleBoard-xM)
-		56	# I2C module 1
-		57	# I2C module 2
-		61	# I2C module 3
-		# AM335X (BeagleBone)
-		70	# I2C module 1
-		71	# I2C module 2
-		30	# I2C module 3
-	;
-	ipc SYSTEM RS DS;
-};
-
 service cat24c256
 {
 	ipc SYSTEM RS DS i2c;
@@ -655,25 +484,6 @@ service tps65950
 	ipc SYSTEM RS DS i2c readclock.drv;
 };
 
-service vbox
-{
-	system
-		UMAP		# 14
-		VUMAP		# 18
-		IRQCTL          # 19
-		DEVIO		# 21
-	;
-	pci device	80ee:cafe;
-	ipc
-		SYSTEM
-		PM
-		RS
-		VM
-		pci
-	;
-	uid	0;
-};
-
 service fbd
 {
 	ipc
diff --git a/minix/drivers/audio/es1370/Makefile b/minix/drivers/audio/es1370/Makefile
index 86e89f645..dc14d59ae 100644
--- a/minix/drivers/audio/es1370/Makefile
+++ b/minix/drivers/audio/es1370/Makefile
@@ -2,6 +2,10 @@
 PROG=	es1370
 SRCS=	es1370.c ak4531.c pci_helper.c
 
+FILES=$(PROG).conf
+FILESNAME=$(PROG)
+FILESDIR= /etc/system.conf.d
+
 DPADD+= ${LIBAUDIODRIVER} ${LIBCHARDRIVER} ${LIBSYS}
 LDADD+= -laudiodriver -lchardriver -lsys
 
diff --git a/minix/drivers/audio/es1371/Makefile b/minix/drivers/audio/es1371/Makefile
index f7608ad75..a9a27d5b0 100644
--- a/minix/drivers/audio/es1371/Makefile
+++ b/minix/drivers/audio/es1371/Makefile
@@ -2,6 +2,10 @@
 PROG=	es1371
 SRCS=	es1371.c AC97.c pci_helper.c wait.c sample_rate_converter.c
 
+FILES=$(PROG).conf
+FILESNAME=$(PROG)
+FILESDIR= /etc/system.conf.d
+
 DPADD+= ${LIBAUDIODRIVER} ${LIBCHARDRIVER} ${LIBSYS}
 LDADD+= -laudiodriver -lchardriver -lsys
 
diff --git a/minix/drivers/bus/ti1225/Makefile b/minix/drivers/bus/ti1225/Makefile
index e1c1a11d0..b00c36a9e 100644
--- a/minix/drivers/bus/ti1225/Makefile
+++ b/minix/drivers/bus/ti1225/Makefile
@@ -2,6 +2,10 @@
 PROG=	ti1225
 SRCS=	ti1225.c
 
+FILES=$(PROG).conf
+FILESNAME=$(PROG)
+FILESDIR= /etc/system.conf.d
+
 DPADD+=	${LIBSYS}
 LDADD+=	-lsys
 
diff --git a/minix/drivers/examples/hello/Makefile b/minix/drivers/examples/hello/Makefile
index 248c37b0c..4badb39fd 100644
--- a/minix/drivers/examples/hello/Makefile
+++ b/minix/drivers/examples/hello/Makefile
@@ -2,8 +2,8 @@
 PROG=	hello
 SRCS=	hello.c
 
-FILES=$(PROG).conf
-FILESNAME=$(PROG)
+FILES=${PROG}.conf
+FILESNAME=${PROG}
 FILESDIR= /etc/system.conf.d
 
 DPADD+=	${LIBCHARDRIVER} ${LIBSYS}
diff --git a/minix/drivers/iommu/amddev/Makefile b/minix/drivers/iommu/amddev/Makefile
index f40e80e22..5e4dcd4ad 100644
--- a/minix/drivers/iommu/amddev/Makefile
+++ b/minix/drivers/iommu/amddev/Makefile
@@ -2,6 +2,10 @@
 PROG=	amddev
 SRCS=	amddev.c
 
+FILES=$(PROG).conf
+FILESNAME=$(PROG)
+FILESDIR= /etc/system.conf.d
+
 DPADD+= ${LIBSYS}
 LDADD+=	-lsys
 
diff --git a/minix/drivers/net/dp8390/Makefile b/minix/drivers/net/dp8390/Makefile
index d48227ef7..bd3b36632 100644
--- a/minix/drivers/net/dp8390/Makefile
+++ b/minix/drivers/net/dp8390/Makefile
@@ -2,6 +2,10 @@
 PROG=	dp8390
 SRCS=	3c503.c dp8390.c ne2000.c rtl8029.c wdeth.c
 
+FILES=${PROG}.conf
+FILESNAME=${PROG}
+FILESDIR= /etc/system.conf.d
+
 DPADD+=	${LIBNETDRIVER} ${LIBSYS}
 LDADD+=	-lnetdriver -lsys
 
diff --git a/minix/drivers/net/dpeth/Makefile b/minix/drivers/net/dpeth/Makefile
index 8bf0cdff6..346c8d688 100644
--- a/minix/drivers/net/dpeth/Makefile
+++ b/minix/drivers/net/dpeth/Makefile
@@ -2,6 +2,10 @@
 PROG=	dpeth
 SRCS=	3c501.c 3c509.c 3c503.c ne.c wd.c 8390.c devio.c netbuff.c dp.c
 
+FILES=$(PROG).conf
+FILESNAME=$(PROG)
+FILESDIR= /etc/system.conf.d
+
 DPADD+=	${LIBNETDRIVER} ${LIBSYS}
 LDADD+=	-lnetdriver -lsys
 
diff --git a/minix/drivers/printer/printer/Makefile b/minix/drivers/printer/printer/Makefile
index e1b045b3c..3acf95da5 100644
--- a/minix/drivers/printer/printer/Makefile
+++ b/minix/drivers/printer/printer/Makefile
@@ -2,6 +2,10 @@
 PROG=	printer
 SRCS=	printer.c liveupdate.c
 
+FILES=${PROG}.conf
+FILESNAME=${PROG}
+FILESDIR= /etc/system.conf.d
+
 DPADD+= ${LIBCHARDRIVER} ${LIBSYS}
 LDADD+=	-lchardriver -lsys
 
diff --git a/minix/drivers/sensors/bmp085/Makefile b/minix/drivers/sensors/bmp085/Makefile
index 64ecdfaed..8f3f9cd4b 100644
--- a/minix/drivers/sensors/bmp085/Makefile
+++ b/minix/drivers/sensors/bmp085/Makefile
@@ -3,8 +3,8 @@
 PROG=   bmp085
 SRCS=   bmp085.c
 
-FILES=$(PROG).conf
-FILESNAME=$(PROG)
+FILES=${PROG}.conf
+FILESNAME=${PROG}
 FILESDIR= /etc/system.conf.d
 
 DPADD+=	${LIBI2CDRIVER} ${LIBCHARDRIVER} ${LIBSYS} ${LIBTIMERS}
diff --git a/minix/drivers/sensors/sht21/Makefile b/minix/drivers/sensors/sht21/Makefile
index 8d7d90dc2..c1676b31c 100644
--- a/minix/drivers/sensors/sht21/Makefile
+++ b/minix/drivers/sensors/sht21/Makefile
@@ -3,8 +3,8 @@
 PROG=   sht21
 SRCS=   sht21.c
 
-FILES=$(PROG).conf
-FILESNAME=$(PROG)
+FILES=${PROG}.conf
+FILESNAME=${PROG}
 FILESDIR= /etc/system.conf.d
 
 DPADD+=	${LIBI2CDRIVER} ${LIBCHARDRIVER} ${LIBSYS} ${LIBTIMERS}
diff --git a/minix/drivers/sensors/tsl2550/Makefile b/minix/drivers/sensors/tsl2550/Makefile
index 57c8c4765..6afbbecd5 100644
--- a/minix/drivers/sensors/tsl2550/Makefile
+++ b/minix/drivers/sensors/tsl2550/Makefile
@@ -3,8 +3,8 @@
 PROG=   tsl2550
 SRCS=   tsl2550.c
 
-FILES=$(PROG).conf
-FILESNAME=$(PROG)
+FILES=${PROG}.conf
+FILESNAME=${PROG}
 FILESDIR= /etc/system.conf.d
 
 DPADD+=	${LIBI2CDRIVER} ${LIBCHARDRIVER} ${LIBSYS} ${LIBTIMERS}
diff --git a/minix/drivers/system/gpio/Makefile b/minix/drivers/system/gpio/Makefile
index ef195ea06..2d731735f 100644
--- a/minix/drivers/system/gpio/Makefile
+++ b/minix/drivers/system/gpio/Makefile
@@ -2,6 +2,10 @@
 PROG=	gpio
 SRCS=	gpio.c
 
+FILES=${PROG}.conf
+FILESNAME=${PROG}
+FILESDIR= /etc/system.conf.d
+
 DPADD+=	${LIBVTREEFS} ${LIBFSDRIVER} ${LIBSYS} ${LIBGPIO} ${LIBCLKCONF}
 LDADD+=	-lvtreefs -lfsdriver -lsys -lgpio -lclkconf
 
diff --git a/minix/drivers/system/random/Makefile b/minix/drivers/system/random/Makefile
index ac1fb733a..1842fb1d9 100644
--- a/minix/drivers/system/random/Makefile
+++ b/minix/drivers/system/random/Makefile
@@ -2,6 +2,10 @@
 PROG=	random
 SRCS=	main.c random.c rijndael_api.c rijndael_alg.c
 
+FILES=$(PROG).conf
+FILESNAME=$(PROG)
+FILESDIR= /etc/system.conf.d
+
 .PATH:	${.CURDIR}/aes
 
 DPADD+=	${LIBCHARDRIVER} ${LIBSYS}
diff --git a/minix/drivers/vmm_guest/vbox/Makefile b/minix/drivers/vmm_guest/vbox/Makefile
index a8aab8b31..20adaf0f7 100644
--- a/minix/drivers/vmm_guest/vbox/Makefile
+++ b/minix/drivers/vmm_guest/vbox/Makefile
@@ -2,6 +2,10 @@
 PROG=	vbox
 SRCS=	vbox.c hgcm.c err.c
 
+FILES=${PROG}.conf
+FILESNAME=${PROG}
+FILESDIR= /etc/system.conf.d
+
 DPADD+=	${LIBSYS}
 LDADD+=	-lsys
 
diff --git a/minix/fs/vbfs/Makefile b/minix/fs/vbfs/Makefile
index b1b2b4626..1051f066a 100644
--- a/minix/fs/vbfs/Makefile
+++ b/minix/fs/vbfs/Makefile
@@ -3,6 +3,10 @@ PROG=	vbfs
 SRCS=	vbfs.c
 MAN=	vbfs.8
 
+FILES=$(PROG).conf
+FILESNAME=$(PROG)
+FILESDIR= /etc/system.conf.d
+
 DPADD+=	${LIBSFFS} ${LIBVBOXFS} ${LIBFSDRIVER} ${LIBSYS}
 LDADD+=	-lsffs -lvboxfs -lfsdriver -lsys
 
diff --git a/minix/net/inet/Makefile b/minix/net/inet/Makefile
index b2ab09005..a3b4fce20 100644
--- a/minix/net/inet/Makefile
+++ b/minix/net/inet/Makefile
@@ -11,6 +11,10 @@ SRCS=	buf.c clock.c inet.c inet_config.c \
 	queryparam.c version.c
 MAN=	inet.8
 
+FILES=$(PROG).conf
+FILESNAME=$(PROG)
+FILESDIR= /etc/system.conf.d
+
 .PATH:	${.CURDIR}/generic
 
 DPADD+=	${LIBCHARDRIVER} ${LIBSYS}
diff --git a/minix/net/lwip/Makefile b/minix/net/lwip/Makefile
index 2eb0102e5..b325b9bfe 100644
--- a/minix/net/lwip/Makefile
+++ b/minix/net/lwip/Makefile
@@ -10,6 +10,10 @@ SRCS=	lwip.c		\
 	inet_config.c	\
 	eth.c
 
+FILES=$(PROG).conf
+FILESNAME=$(PROG)
+FILESDIR= /etc/system.conf.d
+
 .PATH:	${.CURDIR}/generic
 
 DPADD+=	${LIBCHARDRIVER} ${LIBSYS} ${LIBTIMERS} ${LIBLWIP} ${LIBNETSOCK}