diff --git a/Makefile.am b/Makefile.am
index e1d1186887c..60fb3ff7268 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -361,6 +361,8 @@ dist_systemunit_DATA = \
 	units/dev-hugepages.mount \
 	units/dev-mqueue.automount \
 	units/dev-mqueue.mount \
+	units/sys-kernel-config.automount \
+	units/sys-kernel-config.mount \
 	units/sys-kernel-debug.automount \
 	units/sys-kernel-debug.mount \
 	units/sys-kernel-security.automount \
@@ -1840,6 +1842,7 @@ endif
 	( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
 		rm -f dev-hugepages.automount \
 			dev-mqueue.automount \
+			sys-kernel-config.automount \
 			sys-kernel-debug.automount \
 			sys-kernel-security.automount \
 			systemd-vconsole-setup.service \
@@ -1852,6 +1855,7 @@ endif
 			cryptsetup.target && \
 		$(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \
 		$(LN_S) ../dev-mqueue.automount dev-mqueue.automount && \
+		$(LN_S) ../sys-kernel-config.automount sys-kernel-config.automount && \
 		$(LN_S) ../sys-kernel-debug.automount sys-kernel-debug.automount && \
 		$(LN_S) ../sys-kernel-security.automount sys-kernel-security.automount && \
 		$(LN_S) ../systemd-vconsole-setup.service systemd-vconsole-setup.service && \
diff --git a/units/sys-kernel-config.automount b/units/sys-kernel-config.automount
new file mode 100644
index 00000000000..1b4e81117dc
--- /dev/null
+++ b/units/sys-kernel-config.automount
@@ -0,0 +1,15 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Config File System Automount Point
+DefaultDependencies=no
+Before=sysinit.target
+ConditionPathExists=/sys/kernel/config
+
+[Automount]
+Where=/sys/kernel/config
diff --git a/units/sys-kernel-config.mount b/units/sys-kernel-config.mount
new file mode 100644
index 00000000000..a80d052556f
--- /dev/null
+++ b/units/sys-kernel-config.mount
@@ -0,0 +1,15 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Config File System
+DefaultDependencies=no
+
+[Mount]
+What=configfs
+Where=/sys/kernel/config
+Type=configfs