diff --git a/sys/arch/amd64/conf/ALL b/sys/arch/amd64/conf/ALL
index 29cd961245a1..c65835281fd1 100644
--- a/sys/arch/amd64/conf/ALL
+++ b/sys/arch/amd64/conf/ALL
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.77 2018/01/10 11:11:20 knakahara Exp $
+# $NetBSD: ALL,v 1.78 2018/01/13 12:38:16 christos Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@ include 	"arch/amd64/conf/std.amd64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"ALL-$Revision: 1.77 $"
+#ident		"ALL-$Revision: 1.78 $"
 
 maxusers	64		# estimated number of users
 
@@ -1654,6 +1654,9 @@ pseudo-device	vcoda			# coda minicache <-> venus comm.
 # a pseudo device needed for SMBFS
 pseudo-device	nsmb			# experimental - SMB requester
 
+# a pseudo device needed for AUTOFS
+pseudo-device	autofs			# experimental - AUTOFS
+
 # iSCSI initiator
 pseudo-device	iscsi
 
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 790169afcc5b..b0e87f8c9090 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.480 2018/01/10 11:11:20 knakahara Exp $
+# $NetBSD: GENERIC,v 1.481 2018/01/13 12:38:16 christos Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/amd64/conf/std.amd64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.480 $"
+#ident		"GENERIC-$Revision: 1.481 $"
 
 maxusers	64		# estimated number of users
 
@@ -1325,6 +1325,9 @@ pseudo-device	vcoda			# coda minicache <-> venus comm.
 # a pseudo device needed for SMBFS
 pseudo-device	nsmb			# experimental - SMB requester
 
+# a pseudo device needed for AUTOFS
+#pseudo-device	autofs			# experimental - AUTOFS
+
 # wscons pseudo-devices
 pseudo-device	wsmux			# mouse & keyboard multiplexor
 pseudo-device	wsfont
diff --git a/sys/arch/amd64/conf/MODULAR b/sys/arch/amd64/conf/MODULAR
index 677cda757d20..4c2b0730dbd9 100644
--- a/sys/arch/amd64/conf/MODULAR
+++ b/sys/arch/amd64/conf/MODULAR
@@ -1,4 +1,4 @@
-# $NetBSD: MODULAR,v 1.10 2018/01/09 03:31:12 christos Exp $
+# $NetBSD: MODULAR,v 1.11 2018/01/13 12:38:16 christos Exp $
 #
 # Try to exclude all the drivers in GENERIC that have been modularized
 # XXX: incomplete
@@ -132,6 +132,7 @@ options 	MODULAR_DEFAULT_AUTOLOAD
 # miscellaneous pseudo-devices
 -no pseudo-device	clockctl		# user control of clock subsystem
 -no pseudo-device	vcoda			# coda minicache <-> venus comm.
+-no pseudo-device	autofs			# experimental - AUTOFS
 
 # a pseudo device needed for SMBFS
 -no pseudo-device	nsmb			# experimental - SMB requester
diff --git a/sys/arch/amd64/conf/XEN3_DOM0 b/sys/arch/amd64/conf/XEN3_DOM0
index 3c1288ef2ebe..d1cb16fd32a7 100644
--- a/sys/arch/amd64/conf/XEN3_DOM0
+++ b/sys/arch/amd64/conf/XEN3_DOM0
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.143 2018/01/09 03:31:12 christos Exp $
+# $NetBSD: XEN3_DOM0,v 1.144 2018/01/13 12:38:16 christos Exp $
 
 include 	"arch/amd64/conf/std.xen"
 
@@ -10,7 +10,7 @@ options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 #options 	UVMHIST_PRINT
 #options 	SYSCALL_DEBUG
 
-#ident		"XEN3_DOM0-$Revision: 1.143 $"
+#ident		"XEN3_DOM0-$Revision: 1.144 $"
 
 maxusers	32		# estimated number of users
 
@@ -888,6 +888,9 @@ pseudo-device	vcoda			# coda minicache <-> venus comm.
 # a pseudo device needed for SMBFS
 pseudo-device	nsmb			# experimental - SMB requester
 
+# a pseudo device needed for AUTOFS
+#pseudo-device	autofs			# experimental - AUTOFS
+
 # iSCSI initiator
 #pseudo-device	iscsi
 
diff --git a/sys/arch/amd64/conf/XEN3_DOMU b/sys/arch/amd64/conf/XEN3_DOMU
index b1801e68c467..baa42227a1c2 100644
--- a/sys/arch/amd64/conf/XEN3_DOMU
+++ b/sys/arch/amd64/conf/XEN3_DOMU
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.81 2018/01/09 03:31:12 christos Exp $
+# $NetBSD: XEN3_DOMU,v 1.82 2018/01/13 12:38:16 christos Exp $
 
 include 	"arch/amd64/conf/std.xen"
 
@@ -10,7 +10,7 @@ options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 #options 	UVMHIST_PRINT
 #options 	SYSCALL_DEBUG
 
-#ident		"XEN3_DOMU-$Revision: 1.81 $"
+#ident		"XEN3_DOMU-$Revision: 1.82 $"
 
 maxusers	32		# estimated number of users
 
@@ -239,6 +239,9 @@ pseudo-device	vcoda			# coda minicache <-> venus comm.
 # a pseudo device needed for SMBFS
 pseudo-device	nsmb			# experimental - SMB requester
 
+# a pseudo device needed for AUTOFS
+#pseudo-device	autofs			# experimental - AUTOFS
+
 # iSCSI initiator and dependencies
 #scsibus* at scsi?
 #sd*	at scsibus? target ? lun ?