diff --git a/Makefile.am b/Makefile.am
index 0285c8bee6..a84cc13686 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -559,9 +559,7 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/specifier.c \
 	src/shared/specifier.h \
 	src/shared/spawn-polkit-agent.c \
-	src/shared/spawn-polkit-agent.h \
-	src/shared/dev-setup.c \
-	src/shared/dev-setup.h
+	src/shared/spawn-polkit-agent.h
 
 libsystemd_shared_la_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -602,7 +600,9 @@ libsystemd_label_la_SOURCES = \
 	src/shared/mkdir.c \
 	src/shared/mkdir.h \
 	src/shared/ask-password-api.c \
-	src/shared/ask-password-api.h
+	src/shared/ask-password-api.h \
+	src/shared/dev-setup.c \
+	src/shared/dev-setup.h
 
 libsystemd_label_la_CFLAGS = \
 	$(AM_CFLAGS) \
diff --git a/TODO b/TODO
index c85848de90..856d449b55 100644
--- a/TODO
+++ b/TODO
@@ -16,6 +16,8 @@ Bugfixes:
 * properly handle .mount unit state tracking when two mount points are stacked one on top of another on the exact same mount point.
 
 Features:
+* nspawn wants dev_setup() for /dev/fd/ and friends?
+
 * selinux: merge systemd selinux access controls (dwalsh)
 
 * cg_shorten_controllers() misuses alloca()