diff --git a/Makefile.am b/Makefile.am
index 194e3737d7..ffa9ad9a82 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -89,8 +89,13 @@ dist_systemunit_DATA = \
 	units/dev-mqueue.mount \
 	units/proc-sys-fs-binfmt_misc.automount \
 	units/proc-sys-fs-binfmt_misc.mount \
+	units/sys-fs-fuse-connections.automount \
+	units/sys-fs-fuse-connections.mount \
 	units/sys-kernel-debug.automount \
 	units/sys-kernel-debug.mount \
+	units/sys-kernel-security.automount \
+	units/sys-kernel-security.mount \
+	units/var-lock.mount \
 	units/var-run.mount
 
 systemunit_DATA = \
@@ -475,11 +480,18 @@ install-data-hook:
 		rm -f getty.target && \
 		$(LN_S) $(systemunitdir)/getty.target getty.target )
 	( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
-		rm -f dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount && \
+		rm -f dev-hugepages.automount \
+			dev-mqueue.automount \
+			proc-sys-fs-binfmt_misc.automount \
+			sys-kernel-debug.automount \
+			sys-fs-fuse-connections.automount \
+			sys-kernel-security.automount && \
 		$(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \
 		$(LN_S) ../dev-mqueue.automount dev-mqueue.automount && \
 		$(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount && \
-		$(LN_S) ../sys-kernel-debug.automount sys-kernel-debug.automount )
+		$(LN_S) ../sys-kernel-debug.automount sys-kernel-debug.automount && \
+		$(LN_S) ../sys-kernel-security.automount sys-kernel-security.automount && \
+		$(LN_S) ../sys-fs-fuse-connections.automount sys-fs-fuse-connections.automount )
 if TARGET_FEDORA
 	( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
 		rm -f prefdm.service && \
diff --git a/fixme b/fixme
index 0585d1d6f3..b6752d9bf6 100644
--- a/fixme
+++ b/fixme
@@ -56,6 +56,14 @@
 
 * teach dbus to talk to systemd when autospawning services
 
+* regnerate unit/sysv search paths on daemon reload
+
+* write utmp record a la upstart for processes
+
+* run PAM session stuff
+
+* tcpwrap
+
 Regularly:
 
 * look for close() vs. close_nointr() vs. close_nointr_nofail()
diff --git a/units/sys-fs-fuse-connections.automount b/units/sys-fs-fuse-connections.automount
new file mode 100644
index 0000000000..db1316277f
--- /dev/null
+++ b/units/sys-fs-fuse-connections.automount
@@ -0,0 +1,13 @@
+#  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=FUSE Control File System Automount Point
+Before=basic.target
+
+[Automount]
+Where=/sys/fs/fuse/connections
diff --git a/units/sys-fs-fuse-connections.mount b/units/sys-fs-fuse-connections.mount
new file mode 100644
index 0000000000..0a0a4e8ccb
--- /dev/null
+++ b/units/sys-fs-fuse-connections.mount
@@ -0,0 +1,14 @@
+#  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=FUSE Control File System
+
+[Mount]
+What=fusectl
+Where=/sys/fs/fuse/connections
+Type=fusectl
diff --git a/units/sys-kernel-security.automount b/units/sys-kernel-security.automount
new file mode 100644
index 0000000000..061a5a23ad
--- /dev/null
+++ b/units/sys-kernel-security.automount
@@ -0,0 +1,13 @@
+#  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=Security File System Automount Point
+Before=basic.target
+
+[Automount]
+Where=/sys/kernel/security
diff --git a/units/sys-kernel-security.mount b/units/sys-kernel-security.mount
new file mode 100644
index 0000000000..db9d672b60
--- /dev/null
+++ b/units/sys-kernel-security.mount
@@ -0,0 +1,14 @@
+#  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=Security File System
+
+[Mount]
+What=securityfs
+Where=/sys/kernel/security
+Type=securityfs
diff --git a/units/var-lock.mount b/units/var-lock.mount
new file mode 100644
index 0000000000..dbfee59a7a
--- /dev/null
+++ b/units/var-lock.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=Lock Directory
+Before=local-fs.target
+
+[Mount]
+What=tmpfs
+Where=/var/lock
+Type=tmpfs