Merge branch 'lukeshu/postmove' into lukeshu/master

153 files changed, 666 insertions, 330 deletions

diff --git a/src/systemd-backlight/Makefile b/src/grp-helperunits/systemd-backlight/Makefile
index a1919a5c85..cf55ac4db9 100644
--- a/src/systemd-backlight/Makefile
+++ b/src/grp-helperunits/systemd-backlight/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 ifneq ($(ENABLE_BACKLIGHT),)
diff --git a/src/systemd-backlight/backlight.c b/src/grp-helperunits/systemd-backlight/backlight.c
index 45be135a23..45be135a23 100644
--- a/src/systemd-backlight/backlight.c
+++ b/src/grp-helperunits/systemd-backlight/backlight.c
diff --git a/src/systemd-binfmt/Makefile b/src/grp-helperunits/systemd-binfmt/Makefile
index 77dcd56942..3e5c1ac270 100644
--- a/src/systemd-binfmt/Makefile
+++ b/src/grp-helperunits/systemd-binfmt/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 ifneq ($(ENABLE_BINFMT),)
diff --git a/src/systemd-binfmt/binfmt.c b/src/grp-helperunits/systemd-binfmt/binfmt.c
index eeef04fb1c..eeef04fb1c 100644
--- a/src/systemd-binfmt/binfmt.c
+++ b/src/grp-helperunits/systemd-binfmt/binfmt.c
diff --git a/src/systemd-detect-virt/Makefile b/src/grp-helperunits/systemd-detect-virt/Makefile
index 0ac37341ea..7b9b9f667b 100644
--- a/src/systemd-detect-virt/Makefile
+++ b/src/grp-helperunits/systemd-detect-virt/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 bin_PROGRAMS += systemd-detect-virt
diff --git a/src/systemd-detect-virt/detect-virt.c b/src/grp-helperunits/systemd-detect-virt/detect-virt.c
index 5d51589a31..5d51589a31 100644
--- a/src/systemd-detect-virt/detect-virt.c
+++ b/src/grp-helperunits/systemd-detect-virt/detect-virt.c
diff --git a/src/systemd-quotacheck/Makefile b/src/grp-helperunits/systemd-quotacheck/Makefile
index 2136c1351e..979ae07c9e 100644
--- a/src/systemd-quotacheck/Makefile
+++ b/src/grp-helperunits/systemd-quotacheck/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 ifneq ($(ENABLE_QUOTACHECK),)
diff --git a/src/systemd-quotacheck/quotacheck.c b/src/grp-helperunits/systemd-quotacheck/quotacheck.c
index 6d8c05f046..6d8c05f046 100644
--- a/src/systemd-quotacheck/quotacheck.c
+++ b/src/grp-helperunits/systemd-quotacheck/quotacheck.c
diff --git a/src/systemd-random-seed/Makefile b/src/grp-helperunits/systemd-random-seed/Makefile
index 2df6252927..65ae60828b 100644
--- a/src/systemd-random-seed/Makefile
+++ b/src/grp-helperunits/systemd-random-seed/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 ifneq ($(ENABLE_RANDOMSEED),)
diff --git a/src/systemd-random-seed/random-seed.c b/src/grp-helperunits/systemd-random-seed/random-seed.c
index 6748bb9dd3..6748bb9dd3 100644
--- a/src/systemd-random-seed/random-seed.c
+++ b/src/grp-helperunits/systemd-random-seed/random-seed.c
diff --git a/src/systemd-rfkill/Makefile b/src/grp-helperunits/systemd-rfkill/Makefile
index edf5c0af42..2b4430b712 100644
--- a/src/systemd-rfkill/Makefile
+++ b/src/grp-helperunits/systemd-rfkill/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 ifneq ($(ENABLE_RFKILL),)
diff --git a/src/systemd-rfkill/rfkill.c b/src/grp-helperunits/systemd-rfkill/rfkill.c
index f0b0ad9275..f0b0ad9275 100644
--- a/src/systemd-rfkill/rfkill.c
+++ b/src/grp-helperunits/systemd-rfkill/rfkill.c
diff --git a/src/systemd-sleep/Makefile b/src/grp-helperunits/systemd-sleep/Makefile
index cfb1a8337a..9ac849f817 100644
--- a/src/systemd-sleep/Makefile
+++ b/src/grp-helperunits/systemd-sleep/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 rootlibexec_PROGRAMS += systemd-sleep
diff --git a/src/systemd-sleep/sleep.c b/src/grp-helperunits/systemd-sleep/sleep.c
index 7f8a95728d..7f8a95728d 100644
--- a/src/systemd-sleep/sleep.c
+++ b/src/grp-helperunits/systemd-sleep/sleep.c
diff --git a/src/systemd-user-sessions/Makefile b/src/grp-helperunits/systemd-user-sessions/Makefile
index 0586135791..66fa3b7059 100644
--- a/src/systemd-user-sessions/Makefile
+++ b/src/grp-helperunits/systemd-user-sessions/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 ifneq ($(HAVE_PAM),)
diff --git a/src/systemd-user-sessions/user-sessions.c b/src/grp-helperunits/systemd-user-sessions/user-sessions.c
index 9b29b5ba1d..9b29b5ba1d 100644
--- a/src/systemd-user-sessions/user-sessions.c
+++ b/src/grp-helperunits/systemd-user-sessions/user-sessions.c
diff --git a/src/systemd-vconsole/.gitignore b/src/grp-helperunits/systemd-vconsole-setup/.gitignore
index 82741b2fb3..82741b2fb3 100644
--- a/src/systemd-vconsole/.gitignore
+++ b/src/grp-helperunits/systemd-vconsole-setup/.gitignore
diff --git a/src/systemd-vconsole/90-vconsole.rules.in b/src/grp-helperunits/systemd-vconsole-setup/90-vconsole.rules.in
index 35b9ad5151..35b9ad5151 100644
--- a/src/systemd-vconsole/90-vconsole.rules.in
+++ b/src/grp-helperunits/systemd-vconsole-setup/90-vconsole.rules.in
diff --git a/src/systemd-vconsole/Makefile b/src/grp-helperunits/systemd-vconsole-setup/Makefile
index e0623cf50d..99b369967e 100644
--- a/src/systemd-vconsole/Makefile
+++ b/src/grp-helperunits/systemd-vconsole-setup/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 ifneq ($(ENABLE_VCONSOLE),)
diff --git a/src/systemd-vconsole/vconsole-setup.c b/src/grp-helperunits/systemd-vconsole-setup/vconsole-setup.c
index 1118118450..1118118450 100644
--- a/src/systemd-vconsole/vconsole-setup.c
+++ b/src/grp-helperunits/systemd-vconsole-setup/vconsole-setup.c
diff --git a/src/grp-import/Makefile b/src/grp-import/Makefile
index 62e55c17a8..46be93c42f 100644
--- a/src/grp-import/Makefile
+++ b/src/grp-import/Makefile
@@ -31,109 +31,6 @@ ifneq ($(HAVE_ZLIB),)
 ifneq ($(HAVE_BZIP2),)
 ifneq ($(HAVE_GCRYPT),)
 
-rootlibexec_PROGRAMS += \
-	systemd-importd \
-	systemd-pull \
-	systemd-import \
-	systemd-export
-
-systemd_importd_SOURCES = \
-	src/import/importd.c
-
-systemd_importd_CFLAGS = \
-	$(AM_CFLAGS) \
-	-D SYSTEMD_PULL_PATH=\"$(rootlibexecdir)/systemd-pull\" \
-	-D SYSTEMD_IMPORT_PATH=\"$(rootlibexecdir)/systemd-import\" \
-	-D SYSTEMD_EXPORT_PATH=\"$(rootlibexecdir)/systemd-export\"
-
-systemd_importd_LDADD = \
-	libshared.la
-
-systemd_pull_SOURCES = \
-	src/import/pull.c \
-	src/import/pull-raw.c \
-	src/import/pull-raw.h \
-	src/import/pull-tar.c \
-	src/import/pull-tar.h \
-	src/import/pull-job.c \
-	src/import/pull-job.h \
-	src/import/pull-common.c \
-	src/import/pull-common.h \
-	src/import/import-common.c \
-	src/import/import-common.h \
-	src/import/import-compress.c \
-	src/import/import-compress.h \
-	src/import/curl-util.c \
-	src/import/curl-util.h \
-	src/import/qcow2-util.c \
-	src/import/qcow2-util.h
-
-systemd_pull_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(LIBCURL_CFLAGS) \
-	$(XZ_CFLAGS) \
-	$(ZLIB_CFLAGS) \
-	$(BZIP2_CFLAGS) \
-	$(GCRYPT_CFLAGS) \
-	-D VENDOR_KEYRING_PATH=\"$(rootlibexecdir)/import-pubring.gpg\" \
-	-D USER_KEYRING_PATH=\"$(pkgsysconfdir)/import-pubring.gpg\"
-
-systemd_pull_LDADD = \
-	libshared.la \
-	$(LIBCURL_LIBS) \
-	$(XZ_LIBS) \
-	$(ZLIB_LIBS) \
-	$(BZIP2_LIBS) \
-	$(GCRYPT_LIBS)
-
-systemd_import_SOURCES = \
-	src/import/import.c \
-	src/import/import-raw.c \
-	src/import/import-raw.h \
-	src/import/import-tar.c \
-	src/import/import-tar.h \
-	src/import/import-common.c \
-	src/import/import-common.h \
-	src/import/import-compress.c \
-	src/import/import-compress.h \
-	src/import/qcow2-util.c \
-	src/import/qcow2-util.h
-
-systemd_import_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(XZ_CFLAGS) \
-	$(ZLIB_CFLAGS) \
-	$(BZIP2_CFLAGS)
-
-systemd_import_LDADD = \
-	libshared.la \
-	$(XZ_LIBS) \
-	$(ZLIB_LIBS) \
-	$(BZIP2_LIBS)
-
-systemd_export_SOURCES = \
-	src/import/export.c \
-	src/import/export-tar.c \
-	src/import/export-tar.h \
-	src/import/export-raw.c \
-	src/import/export-raw.h \
-	src/import/import-common.c \
-	src/import/import-common.h \
-	src/import/import-compress.c \
-	src/import/import-compress.h
-
-systemd_export_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(XZ_CFLAGS) \
-	$(ZLIB_CFLAGS) \
-	$(BZIP2_CFLAGS)
-
-systemd_export_LDADD = \
-	libshared.la \
-	$(XZ_LIBS) \
-	$(ZLIB_LIBS) \
-	$(BZIP2_LIBS)
-
 dist_rootlibexec_DATA = \
 	src/import/import-pubring.gpg
 
diff --git a/src/grp-import/systemd-export/Makefile b/src/grp-import/systemd-export/Makefile
new file mode 100644
index 0000000000..d0e8781faf
--- /dev/null
+++ b/src/grp-import/systemd-export/Makefile
@@ -0,0 +1,51 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+rootlibexec_PROGRAMS += systemd-export
+
+systemd_export_SOURCES = \
+	src/import/export.c \
+	src/import/export-tar.c \
+	src/import/export-tar.h \
+	src/import/export-raw.c \
+	src/import/export-raw.h \
+	src/import/import-common.c \
+	src/import/import-common.h \
+	src/import/import-compress.c \
+	src/import/import-compress.h
+
+systemd_export_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(XZ_CFLAGS) \
+	$(ZLIB_CFLAGS) \
+	$(BZIP2_CFLAGS)
+
+systemd_export_LDADD = \
+	libshared.la \
+	$(XZ_LIBS) \
+	$(ZLIB_LIBS) \
+	$(BZIP2_LIBS)
+
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-import/export-raw.c b/src/grp-import/systemd-export/export-raw.c
index 658f835132..658f835132 100644
--- a/src/grp-import/export-raw.c
+++ b/src/grp-import/systemd-export/export-raw.c
diff --git a/src/grp-import/export-raw.h b/src/grp-import/systemd-export/export-raw.h
index c7ac134603..c7ac134603 100644
--- a/src/grp-import/export-raw.h
+++ b/src/grp-import/systemd-export/export-raw.h
diff --git a/src/grp-import/export-tar.c b/src/grp-import/systemd-export/export-tar.c
index 9c511984c1..9c511984c1 100644
--- a/src/grp-import/export-tar.c
+++ b/src/grp-import/systemd-export/export-tar.c
diff --git a/src/grp-import/export-tar.h b/src/grp-import/systemd-export/export-tar.h
index 50206cabb3..50206cabb3 100644
--- a/src/grp-import/export-tar.h
+++ b/src/grp-import/systemd-export/export-tar.h
diff --git a/src/grp-import/export.c b/src/grp-import/systemd-export/export.c
index 0a5efe5476..0a5efe5476 100644
--- a/src/grp-import/export.c
+++ b/src/grp-import/systemd-export/export.c
diff --git a/src/grp-import/systemd-import/Makefile b/src/grp-import/systemd-import/Makefile
new file mode 100644
index 0000000000..301556ffd5
--- /dev/null
+++ b/src/grp-import/systemd-import/Makefile
@@ -0,0 +1,52 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+rootlibexec_PROGRAMS += systemd-import
+systemd_import_SOURCES = \
+	src/import/import.c \
+	src/import/import-raw.c \
+	src/import/import-raw.h \
+	src/import/import-tar.c \
+	src/import/import-tar.h \
+	src/import/import-common.c \
+	src/import/import-common.h \
+	src/import/import-compress.c \
+	src/import/import-compress.h \
+	src/import/qcow2-util.c \
+	src/import/qcow2-util.h
+
+systemd_import_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(XZ_CFLAGS) \
+	$(ZLIB_CFLAGS) \
+	$(BZIP2_CFLAGS)
+
+systemd_import_LDADD = \
+	libshared.la \
+	$(XZ_LIBS) \
+	$(ZLIB_LIBS) \
+	$(BZIP2_LIBS)
+
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-import/import-common.c b/src/grp-import/systemd-import/import-common.c
index 287a3382a1..287a3382a1 100644
--- a/src/grp-import/import-common.c
+++ b/src/grp-import/systemd-import/import-common.c
diff --git a/src/grp-import/import-common.h b/src/grp-import/systemd-import/import-common.h
index 07d3250e71..07d3250e71 100644
--- a/src/grp-import/import-common.h
+++ b/src/grp-import/systemd-import/import-common.h
diff --git a/src/grp-import/import-compress.c b/src/grp-import/systemd-import/import-compress.c
index f1766bbe3b..f1766bbe3b 100644
--- a/src/grp-import/import-compress.c
+++ b/src/grp-import/systemd-import/import-compress.c
diff --git a/src/grp-import/import-compress.h b/src/grp-import/systemd-import/import-compress.h
index 6b59d0724b..6b59d0724b 100644
--- a/src/grp-import/import-compress.h
+++ b/src/grp-import/systemd-import/import-compress.h
diff --git a/src/grp-import/import-pubring.gpg b/src/grp-import/systemd-import/import-pubring.gpg
index be27776896..be27776896 100644
--- a/src/grp-import/import-pubring.gpg
+++ b/src/grp-import/systemd-import/import-pubring.gpg
diff --git a/src/grp-import/import-raw.c b/src/grp-import/systemd-import/import-raw.c
index ce37392707..ce37392707 100644
--- a/src/grp-import/import-raw.c
+++ b/src/grp-import/systemd-import/import-raw.c
diff --git a/src/grp-import/import-raw.h b/src/grp-import/systemd-import/import-raw.h
index f0a315c088..f0a315c088 100644
--- a/src/grp-import/import-raw.h
+++ b/src/grp-import/systemd-import/import-raw.h
diff --git a/src/grp-import/import-tar.c b/src/grp-import/systemd-import/import-tar.c
index 016d05e77d..016d05e77d 100644
--- a/src/grp-import/import-tar.c
+++ b/src/grp-import/systemd-import/import-tar.c
diff --git a/src/grp-import/import-tar.h b/src/grp-import/systemd-import/import-tar.h
index b66b00ddfd..b66b00ddfd 100644
--- a/src/grp-import/import-tar.h
+++ b/src/grp-import/systemd-import/import-tar.h
diff --git a/src/grp-import/import.c b/src/grp-import/systemd-import/import.c
index 338847dbc2..338847dbc2 100644
--- a/src/grp-import/import.c
+++ b/src/grp-import/systemd-import/import.c
diff --git a/src/grp-import/systemd-importd/Makefile b/src/grp-import/systemd-importd/Makefile
new file mode 100644
index 0000000000..7911bfce82
--- /dev/null
+++ b/src/grp-import/systemd-importd/Makefile
@@ -0,0 +1,39 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+rootlibexec_PROGRAMS += systemd-importd
+systemd_importd_SOURCES = \
+	src/import/importd.c
+
+systemd_importd_CFLAGS = \
+	$(AM_CFLAGS) \
+	-D SYSTEMD_PULL_PATH=\"$(rootlibexecdir)/systemd-pull\" \
+	-D SYSTEMD_IMPORT_PATH=\"$(rootlibexecdir)/systemd-import\" \
+	-D SYSTEMD_EXPORT_PATH=\"$(rootlibexecdir)/systemd-export\"
+
+systemd_importd_LDADD = \
+	libshared.la
+
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-import/importd.c b/src/grp-import/systemd-importd/importd.c
index e30dfdf805..e30dfdf805 100644
--- a/src/grp-import/importd.c
+++ b/src/grp-import/systemd-importd/importd.c
diff --git a/src/grp-import/systemd-pull/Makefile b/src/grp-import/systemd-pull/Makefile
new file mode 100644
index 0000000000..36505edb5b
--- /dev/null
+++ b/src/grp-import/systemd-pull/Makefile
@@ -0,0 +1,64 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+rootlibexec_PROGRAMS += systemd-pull
+systemd_pull_SOURCES = \
+	src/import/pull.c \
+	src/import/pull-raw.c \
+	src/import/pull-raw.h \
+	src/import/pull-tar.c \
+	src/import/pull-tar.h \
+	src/import/pull-job.c \
+	src/import/pull-job.h \
+	src/import/pull-common.c \
+	src/import/pull-common.h \
+	src/import/import-common.c \
+	src/import/import-common.h \
+	src/import/import-compress.c \
+	src/import/import-compress.h \
+	src/import/curl-util.c \
+	src/import/curl-util.h \
+	src/import/qcow2-util.c \
+	src/import/qcow2-util.h
+
+systemd_pull_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(LIBCURL_CFLAGS) \
+	$(XZ_CFLAGS) \
+	$(ZLIB_CFLAGS) \
+	$(BZIP2_CFLAGS) \
+	$(GCRYPT_CFLAGS) \
+	-D VENDOR_KEYRING_PATH=\"$(rootlibexecdir)/import-pubring.gpg\" \
+	-D USER_KEYRING_PATH=\"$(pkgsysconfdir)/import-pubring.gpg\"
+
+systemd_pull_LDADD = \
+	libshared.la \
+	$(LIBCURL_LIBS) \
+	$(XZ_LIBS) \
+	$(ZLIB_LIBS) \
+	$(BZIP2_LIBS) \
+	$(GCRYPT_LIBS)
+
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-import/pull-common.c b/src/grp-import/systemd-pull/pull-common.c
index dc4e4667a9..dc4e4667a9 100644
--- a/src/grp-import/pull-common.c
+++ b/src/grp-import/systemd-pull/pull-common.c
diff --git a/src/grp-import/pull-common.h b/src/grp-import/systemd-pull/pull-common.h
index 929a131c88..929a131c88 100644
--- a/src/grp-import/pull-common.h
+++ b/src/grp-import/systemd-pull/pull-common.h
diff --git a/src/grp-import/pull-job.c b/src/grp-import/systemd-pull/pull-job.c
index 6bcf35ef4e..6bcf35ef4e 100644
--- a/src/grp-import/pull-job.c
+++ b/src/grp-import/systemd-pull/pull-job.c
diff --git a/src/grp-import/pull-job.h b/src/grp-import/systemd-pull/pull-job.h
index 3a152a50e3..3a152a50e3 100644
--- a/src/grp-import/pull-job.h
+++ b/src/grp-import/systemd-pull/pull-job.h
diff --git a/src/grp-import/pull-raw.c b/src/grp-import/systemd-pull/pull-raw.c
index 19155cc53a..19155cc53a 100644
--- a/src/grp-import/pull-raw.c
+++ b/src/grp-import/systemd-pull/pull-raw.c
diff --git a/src/grp-import/pull-raw.h b/src/grp-import/systemd-pull/pull-raw.h
index 6bafa6dafd..6bafa6dafd 100644
--- a/src/grp-import/pull-raw.h
+++ b/src/grp-import/systemd-pull/pull-raw.h
diff --git a/src/grp-import/pull-tar.c b/src/grp-import/systemd-pull/pull-tar.c
index e0205c3841..e0205c3841 100644
--- a/src/grp-import/pull-tar.c
+++ b/src/grp-import/systemd-pull/pull-tar.c
diff --git a/src/grp-import/pull-tar.h b/src/grp-import/systemd-pull/pull-tar.h
index 9ff5bd5953..9ff5bd5953 100644
--- a/src/grp-import/pull-tar.h
+++ b/src/grp-import/systemd-pull/pull-tar.h
diff --git a/src/grp-import/pull.c b/src/grp-import/systemd-pull/pull.c
index 74df24f993..74df24f993 100644
--- a/src/grp-import/pull.c
+++ b/src/grp-import/systemd-pull/pull.c
diff --git a/src/grp-login/Makefile b/src/grp-login/Makefile
index d03408cf11..381d653166 100644
--- a/src/grp-login/Makefile
+++ b/src/grp-login/Makefile
@@ -24,82 +24,6 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 ifneq ($(ENABLE_LOGIND),)
-systemd_logind_SOURCES = \
-	src/login/logind.c \
-	src/login/logind.h
-
-nodist_systemd_logind_SOURCES = \
-	src/login/logind-gperf.c
-
-systemd_logind_LDADD = \
-	liblogind-core.la
-
-liblogind_core_la_SOURCES = \
-	src/login/logind-core.c \
-	src/login/logind-device.c \
-	src/login/logind-device.h \
-	src/login/logind-button.c \
-	src/login/logind-button.h \
-	src/login/logind-action.c \
-	src/login/logind-action.h \
-	src/login/logind-seat.c \
-	src/login/logind-seat.h \
-	src/login/logind-session.c \
-	src/login/logind-session.h \
-	src/login/logind-session-device.c \
-	src/login/logind-session-device.h \
-	src/login/logind-user.c \
-	src/login/logind-user.h \
-	src/login/logind-inhibit.c \
-	src/login/logind-inhibit.h \
-	src/login/logind-dbus.c \
-	src/login/logind-session-dbus.c \
-	src/login/logind-seat-dbus.c \
-	src/login/logind-user-dbus.c \
-	src/login/logind-utmp.c \
-	src/login/logind-acl.h
-
-liblogind_core_la_LIBADD = \
-	libshared.la
-
-ifneq ($(HAVE_ACL),)
-liblogind_core_la_SOURCES += \
-	src/login/logind-acl.c
-endif # HAVE_ACL
-
-noinst_LTLIBRARIES += \
-	liblogind-core.la
-
-rootlibexec_PROGRAMS += \
-	systemd-logind
-
-loginctl_SOURCES = \
-	src/login/loginctl.c \
-	src/login/sysfs-show.h \
-	src/login/sysfs-show.c
-
-loginctl_LDADD = \
-	libshared.la
-
-rootbin_PROGRAMS += \
-	loginctl
-
-dist_bashcompletion_data += \
-	shell-completion/bash/loginctl
-
-dist_zshcompletion_data += \
-	shell-completion/zsh/_loginctl \
-	shell-completion/zsh/_systemd-inhibit
-
-systemd_inhibit_SOURCES = \
-	src/login/inhibit.c
-
-systemd_inhibit_LDADD = \
-	libshared.la
-
-rootbin_PROGRAMS += \
-	systemd-inhibit
-
 test_login_SOURCES = \
 	src/libsystemd/sd-login/test-login.c
 
@@ -132,36 +56,6 @@ tests += \
 	test-login-tables \
 	test-login-shared
 
-ifneq ($(HAVE_PAM),)
-pam_systemd_la_SOURCES = \
-	src/login/pam_systemd.sym \
-	src/login/pam_systemd.c
-
-pam_systemd_la_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(PAM_CFLAGS)
-
-pam_systemd_la_LDFLAGS = \
-	$(AM_LDFLAGS) \
-	-module \
-	-export-dynamic \
-	-avoid-version \
-	-shared \
-	-Wl,--version-script=$(srcdir)/pam_systemd.sym
-
-pam_systemd_la_LIBADD = \
-	libshared.la \
-	$(PAM_LIBS)
-
-pamlib_LTLIBRARIES = \
-	pam_systemd.la
-
-dist_pamconf_DATA = \
-	src/login/systemd-user
-
-EXTRA_DIST += \
-	src/login/systemd-user.m4
-endif # HAVE_PAM
 
 nodist_systemunit_DATA += \
 	units/systemd-logind.service
diff --git a/src/grp-login/liblogind-core/Makefile b/src/grp-login/liblogind-core/Makefile
new file mode 100644
index 0000000000..1575518aec
--- /dev/null
+++ b/src/grp-login/liblogind-core/Makefile
@@ -0,0 +1,62 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+liblogind_core_la_SOURCES = \
+	src/login/logind-core.c \
+	src/login/logind-device.c \
+	src/login/logind-device.h \
+	src/login/logind-button.c \
+	src/login/logind-button.h \
+	src/login/logind-action.c \
+	src/login/logind-action.h \
+	src/login/logind-seat.c \
+	src/login/logind-seat.h \
+	src/login/logind-session.c \
+	src/login/logind-session.h \
+	src/login/logind-session-device.c \
+	src/login/logind-session-device.h \
+	src/login/logind-user.c \
+	src/login/logind-user.h \
+	src/login/logind-inhibit.c \
+	src/login/logind-inhibit.h \
+	src/login/logind-dbus.c \
+	src/login/logind-session-dbus.c \
+	src/login/logind-seat-dbus.c \
+	src/login/logind-user-dbus.c \
+	src/login/logind-utmp.c \
+	src/login/logind-acl.h
+
+liblogind_core_la_LIBADD = \
+	libshared.la
+
+ifneq ($(HAVE_ACL),)
+liblogind_core_la_SOURCES += \
+	src/login/logind-acl.c
+endif # HAVE_ACL
+
+noinst_LTLIBRARIES += \
+	liblogind-core.la
+
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-login/logind-acl.c b/src/grp-login/liblogind-core/logind-acl.c
index 0cef88a82d..0cef88a82d 100644
--- a/src/grp-login/logind-acl.c
+++ b/src/grp-login/liblogind-core/logind-acl.c
diff --git a/src/grp-login/logind-acl.h b/src/grp-login/liblogind-core/logind-acl.h
index 1286c6a3cd..1286c6a3cd 100644
--- a/src/grp-login/logind-acl.h
+++ b/src/grp-login/liblogind-core/logind-acl.h
diff --git a/src/grp-login/logind-action.c b/src/grp-login/liblogind-core/logind-action.c
index 9a8089f97c..9a8089f97c 100644
--- a/src/grp-login/logind-action.c
+++ b/src/grp-login/liblogind-core/logind-action.c
diff --git a/src/grp-login/logind-action.h b/src/grp-login/liblogind-core/logind-action.h
index fb40ae48d2..fb40ae48d2 100644
--- a/src/grp-login/logind-action.h
+++ b/src/grp-login/liblogind-core/logind-action.h
diff --git a/src/grp-login/logind-button.c b/src/grp-login/liblogind-core/logind-button.c
index acf7504a2e..acf7504a2e 100644
--- a/src/grp-login/logind-button.c
+++ b/src/grp-login/liblogind-core/logind-button.c
diff --git a/src/grp-login/logind-button.h b/src/grp-login/liblogind-core/logind-button.h
index f30cba2959..f30cba2959 100644
--- a/src/grp-login/logind-button.h
+++ b/src/grp-login/liblogind-core/logind-button.h
diff --git a/src/grp-login/logind-core.c b/src/grp-login/liblogind-core/logind-core.c
index cbf8d757fe..cbf8d757fe 100644
--- a/src/grp-login/logind-core.c
+++ b/src/grp-login/liblogind-core/logind-core.c
diff --git a/src/grp-login/logind-dbus.c b/src/grp-login/liblogind-core/logind-dbus.c
index 90dcd94710..90dcd94710 100644
--- a/src/grp-login/logind-dbus.c
+++ b/src/grp-login/liblogind-core/logind-dbus.c
diff --git a/src/grp-login/logind-device.c b/src/grp-login/liblogind-core/logind-device.c
index eb5edd1cd5..eb5edd1cd5 100644
--- a/src/grp-login/logind-device.c
+++ b/src/grp-login/liblogind-core/logind-device.c
diff --git a/src/grp-login/logind-device.h b/src/grp-login/liblogind-core/logind-device.h
index 927068e00a..927068e00a 100644
--- a/src/grp-login/logind-device.h
+++ b/src/grp-login/liblogind-core/logind-device.h
diff --git a/src/grp-login/logind-gperf.gperf b/src/grp-login/liblogind-core/logind-gperf.gperf
index 6bd08adc05..6bd08adc05 100644
--- a/src/grp-login/logind-gperf.gperf
+++ b/src/grp-login/liblogind-core/logind-gperf.gperf
diff --git a/src/grp-login/logind-inhibit.c b/src/grp-login/liblogind-core/logind-inhibit.c
index 6c78e0dddc..6c78e0dddc 100644
--- a/src/grp-login/logind-inhibit.c
+++ b/src/grp-login/liblogind-core/logind-inhibit.c
diff --git a/src/grp-login/logind-inhibit.h b/src/grp-login/liblogind-core/logind-inhibit.h
index 70de199c60..70de199c60 100644
--- a/src/grp-login/logind-inhibit.h
+++ b/src/grp-login/liblogind-core/logind-inhibit.h
diff --git a/src/grp-login/logind-seat-dbus.c b/src/grp-login/liblogind-core/logind-seat-dbus.c
index f934a5326a..f934a5326a 100644
--- a/src/grp-login/logind-seat-dbus.c
+++ b/src/grp-login/liblogind-core/logind-seat-dbus.c
diff --git a/src/grp-login/logind-seat.c b/src/grp-login/liblogind-core/logind-seat.c
index aec67718a1..aec67718a1 100644
--- a/src/grp-login/logind-seat.c
+++ b/src/grp-login/liblogind-core/logind-seat.c
diff --git a/src/grp-login/logind-seat.h b/src/grp-login/liblogind-core/logind-seat.h
index 9a4fbc5bc5..9a4fbc5bc5 100644
--- a/src/grp-login/logind-seat.h
+++ b/src/grp-login/liblogind-core/logind-seat.h
diff --git a/src/grp-login/logind-session-dbus.c b/src/grp-login/liblogind-core/logind-session-dbus.c
index 22dea5db1f..22dea5db1f 100644
--- a/src/grp-login/logind-session-dbus.c
+++ b/src/grp-login/liblogind-core/logind-session-dbus.c
diff --git a/src/grp-login/logind-session-device.c b/src/grp-login/liblogind-core/logind-session-device.c
index 4055a23277..4055a23277 100644
--- a/src/grp-login/logind-session-device.c
+++ b/src/grp-login/liblogind-core/logind-session-device.c
diff --git a/src/grp-login/logind-session-device.h b/src/grp-login/liblogind-core/logind-session-device.h
index 7c8503583f..7c8503583f 100644
--- a/src/grp-login/logind-session-device.h
+++ b/src/grp-login/liblogind-core/logind-session-device.h
diff --git a/src/grp-login/logind-session.c b/src/grp-login/liblogind-core/logind-session.c
index 11a83106b1..11a83106b1 100644
--- a/src/grp-login/logind-session.c
+++ b/src/grp-login/liblogind-core/logind-session.c
diff --git a/src/grp-login/logind-session.h b/src/grp-login/liblogind-core/logind-session.h
index ffb7cd2d41..ffb7cd2d41 100644
--- a/src/grp-login/logind-session.h
+++ b/src/grp-login/liblogind-core/logind-session.h
diff --git a/src/grp-login/logind-user-dbus.c b/src/grp-login/liblogind-core/logind-user-dbus.c
index af6392e025..af6392e025 100644
--- a/src/grp-login/logind-user-dbus.c
+++ b/src/grp-login/liblogind-core/logind-user-dbus.c
diff --git a/src/grp-login/logind-user.c b/src/grp-login/liblogind-core/logind-user.c
index a826321bf0..a826321bf0 100644
--- a/src/grp-login/logind-user.c
+++ b/src/grp-login/liblogind-core/logind-user.c
diff --git a/src/grp-login/logind-user.h b/src/grp-login/liblogind-core/logind-user.h
index 4f0966dc77..4f0966dc77 100644
--- a/src/grp-login/logind-user.h
+++ b/src/grp-login/liblogind-core/logind-user.h
diff --git a/src/grp-login/logind-utmp.c b/src/grp-login/liblogind-core/logind-utmp.c
index 47599fd466..47599fd466 100644
--- a/src/grp-login/logind-utmp.c
+++ b/src/grp-login/liblogind-core/logind-utmp.c
diff --git a/src/grp-login/loginctl/Makefile b/src/grp-login/loginctl/Makefile
new file mode 100644
index 0000000000..7c8c3d91a0
--- /dev/null
+++ b/src/grp-login/loginctl/Makefile
@@ -0,0 +1,41 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+loginctl_SOURCES = \
+	src/login/loginctl.c \
+	src/login/sysfs-show.h \
+	src/login/sysfs-show.c
+
+loginctl_LDADD = \
+	libshared.la
+
+rootbin_PROGRAMS += \
+	loginctl
+
+dist_bashcompletion_data += \
+	shell-completion/bash/loginctl
+
+dist_zshcompletion_data += shell-completion/zsh/_loginctl
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-login/loginctl.c b/src/grp-login/loginctl/loginctl.c
index f3f57b4b13..f3f57b4b13 100644
--- a/src/grp-login/loginctl.c
+++ b/src/grp-login/loginctl/loginctl.c
diff --git a/src/grp-login/sysfs-show.c b/src/grp-login/loginctl/sysfs-show.c
index 29785e2f11..29785e2f11 100644
--- a/src/grp-login/sysfs-show.c
+++ b/src/grp-login/loginctl/sysfs-show.c
diff --git a/src/grp-login/sysfs-show.h b/src/grp-login/loginctl/sysfs-show.h
index 3e94bc3ed5..3e94bc3ed5 100644
--- a/src/grp-login/sysfs-show.h
+++ b/src/grp-login/loginctl/sysfs-show.h
diff --git a/src/grp-login/pam_systemd/Makefile b/src/grp-login/pam_systemd/Makefile
new file mode 100644
index 0000000000..8c87421bb0
--- /dev/null
+++ b/src/grp-login/pam_systemd/Makefile
@@ -0,0 +1,56 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+ifneq ($(HAVE_PAM),)
+pam_systemd_la_SOURCES = \
+	src/login/pam_systemd.sym \
+	src/login/pam_systemd.c
+
+pam_systemd_la_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(PAM_CFLAGS)
+
+pam_systemd_la_LDFLAGS = \
+	$(AM_LDFLAGS) \
+	-module \
+	-export-dynamic \
+	-avoid-version \
+	-shared \
+	-Wl,--version-script=$(srcdir)/pam_systemd.sym
+
+pam_systemd_la_LIBADD = \
+	libshared.la \
+	$(PAM_LIBS)
+
+pamlib_LTLIBRARIES = \
+	pam_systemd.la
+
+dist_pamconf_DATA = \
+	src/login/systemd-user
+
+EXTRA_DIST += \
+	src/login/systemd-user.m4
+endif # HAVE_PAM
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-login/pam_systemd.c b/src/grp-login/pam_systemd/pam_systemd.c
index 98dc201340..98dc201340 100644
--- a/src/grp-login/pam_systemd.c
+++ b/src/grp-login/pam_systemd/pam_systemd.c
diff --git a/src/grp-login/pam_systemd.sym b/src/grp-login/pam_systemd/pam_systemd.sym
index 23ff75f688..23ff75f688 100644
--- a/src/grp-login/pam_systemd.sym
+++ b/src/grp-login/pam_systemd/pam_systemd.sym
diff --git a/src/grp-login/systemd-inhibit/Makefile b/src/grp-login/systemd-inhibit/Makefile
new file mode 100644
index 0000000000..93440da575
--- /dev/null
+++ b/src/grp-login/systemd-inhibit/Makefile
@@ -0,0 +1,37 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+dist_zshcompletion_data += shell-completion/zsh/_systemd-inhibit
+
+systemd_inhibit_SOURCES = \
+	src/login/inhibit.c
+
+systemd_inhibit_LDADD = \
+	libshared.la
+
+rootbin_PROGRAMS += \
+	systemd-inhibit
+
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-login/inhibit.c b/src/grp-login/systemd-inhibit/inhibit.c
index 905e757a32..905e757a32 100644
--- a/src/grp-login/inhibit.c
+++ b/src/grp-login/systemd-inhibit/inhibit.c
diff --git a/src/grp-login/systemd-logind/Makefile b/src/grp-login/systemd-logind/Makefile
new file mode 100644
index 0000000000..9dd5855e88
--- /dev/null
+++ b/src/grp-login/systemd-logind/Makefile
@@ -0,0 +1,39 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+systemd_logind_SOURCES = \
+	src/login/logind.c \
+	src/login/logind.h
+
+nodist_systemd_logind_SOURCES = \
+	src/login/logind-gperf.c
+
+systemd_logind_LDADD = \
+	liblogind-core.la
+
+rootlibexec_PROGRAMS += \
+	systemd-logind
+
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-login/logind.c b/src/grp-login/systemd-logind/logind.c
index 925c04a344..925c04a344 100644
--- a/src/grp-login/logind.c
+++ b/src/grp-login/systemd-logind/logind.c
diff --git a/src/grp-login/logind.h b/src/grp-login/systemd-logind/logind.h
index 9d43c2e7ee..9d43c2e7ee 100644
--- a/src/grp-login/logind.h
+++ b/src/grp-login/systemd-logind/logind.h
diff --git a/src/grp-network/Makefile b/src/grp-network/Makefile
index 49928fc5ef..7cbd9142d0 100644
--- a/src/grp-network/Makefile
+++ b/src/grp-network/Makefile
@@ -30,118 +30,6 @@ dist_network_DATA = \
 	network/80-container-vz.network
 
 ifneq ($(ENABLE_NETWORKD),)
-rootlibexec_PROGRAMS += \
-	systemd-networkd
-
-systemd_networkd_SOURCES = \
-	src/network/networkd.c
-
-systemd_networkd_LDADD = \
-	libnetworkd-core.la
-
-ifneq ($(HAVE_LIBIPTC),)
-systemd_networkd_LDADD += \
-	libfirewall.la
-endif # HAVE_LIBIPTC
-
-noinst_LTLIBRARIES += \
-	libnetworkd-core.la
-
-libnetworkd_core_la_CFLAGS = \
-	$(AM_CFLAGS)
-
-libnetworkd_core_la_SOURCES = \
-	src/libsystemd-network/network-internal.h \
-	src/network/networkd.h \
-	src/network/networkd-conf.h \
-	src/network/networkd-conf.c \
-	src/network/networkd-link.h \
-	src/network/networkd-link.c \
-	src/network/networkd-netdev.h \
-	src/network/networkd-netdev.c \
-	src/network/networkd-netdev-tunnel.h \
-	src/network/networkd-netdev-tunnel.c \
-	src/network/networkd-netdev-veth.h \
-	src/network/networkd-netdev-veth.c \
-	src/network/networkd-netdev-vxlan.h \
-	src/network/networkd-netdev-vxlan.c \
-	src/network/networkd-netdev-vlan.h \
-	src/network/networkd-netdev-vlan.c \
-	src/network/networkd-netdev-macvlan.h \
-	src/network/networkd-netdev-macvlan.c \
-	src/network/networkd-netdev-ipvlan.h \
-	src/network/networkd-netdev-ipvlan.c \
-	src/network/networkd-netdev-dummy.h \
-	src/network/networkd-netdev-dummy.c \
-	src/network/networkd-netdev-tuntap.h \
-	src/network/networkd-netdev-tuntap.c \
-	src/network/networkd-netdev-bond.h \
-	src/network/networkd-netdev-bond.c \
-	src/network/networkd-netdev-bridge.h \
-	src/network/networkd-netdev-bridge.c \
-	src/network/networkd-link-bus.c \
-	src/network/networkd-ipv4ll.c \
-	src/network/networkd-dhcp4.c \
-	src/network/networkd-dhcp6.c \
-	src/network/networkd-ndisc.c \
-	src/network/networkd-network.h \
-	src/network/networkd-network.c \
-	src/network/networkd-network-bus.c \
-	src/network/networkd-address.h \
-	src/network/networkd-address.c \
-	src/network/networkd-route.h \
-	src/network/networkd-route.c \
-	src/network/networkd-manager.c \
-	src/network/networkd-manager-bus.c \
-	src/network/networkd-fdb.h \
-	src/network/networkd-fdb.c \
-	src/network/networkd-address-pool.h \
-	src/network/networkd-address-pool.c \
-	src/network/networkd-util.h \
-	src/network/networkd-util.c \
-	src/network/networkd-lldp-tx.h \
-	src/network/networkd-lldp-tx.c
-
-nodist_libnetworkd_core_la_SOURCES = \
-	src/network/networkd-gperf.c \
-	src/network/networkd-network-gperf.c \
-	src/network/networkd-netdev-gperf.c
-
-libnetworkd_core_la_LIBADD = \
-	libsystemd-network.la \
-	libshared.la
-
-rootlibexec_PROGRAMS += \
-	systemd-networkd-wait-online
-
-systemd_networkd_wait_online_CFLAGS = \
-	$(AM_CFLAGS)
-
-systemd_networkd_wait_online_SOURCES = \
-	src/libsystemd-network/network-internal.h \
-	src/network/networkd-wait-online.h \
-	src/network/networkd-wait-online-link.h \
-	src/network/networkd-wait-online.c \
-	src/network/networkd-wait-online-manager.c \
-	src/network/networkd-wait-online-link.c
-
-systemd_networkd_wait_online_LDADD = \
-	libsystemd-network.la \
-	libshared.la
-
-rootbin_PROGRAMS += \
-	networkctl
-
-networkctl_SOURCES = \
-	src/network/networkctl.c
-
-networkctl_LDADD = \
-	libshared.la \
-	libsystemd-network.la
-
-dist_bashcompletion_data += \
-	shell-completion/bash/networkctl
-
 test_networkd_conf_SOURCES = \
 	src/network/test-networkd-conf.c
 
diff --git a/src/grp-network/libnetworkd-core/Makefile b/src/grp-network/libnetworkd-core/Makefile
new file mode 100644
index 0000000000..53d65460f2
--- /dev/null
+++ b/src/grp-network/libnetworkd-core/Makefile
@@ -0,0 +1,93 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+noinst_LTLIBRARIES += \
+	libnetworkd-core.la
+
+libnetworkd_core_la_CFLAGS = \
+	$(AM_CFLAGS)
+
+libnetworkd_core_la_SOURCES = \
+	src/libsystemd-network/network-internal.h \
+	src/network/networkd.h \
+	src/network/networkd-conf.h \
+	src/network/networkd-conf.c \
+	src/network/networkd-link.h \
+	src/network/networkd-link.c \
+	src/network/networkd-netdev.h \
+	src/network/networkd-netdev.c \
+	src/network/networkd-netdev-tunnel.h \
+	src/network/networkd-netdev-tunnel.c \
+	src/network/networkd-netdev-veth.h \
+	src/network/networkd-netdev-veth.c \
+	src/network/networkd-netdev-vxlan.h \
+	src/network/networkd-netdev-vxlan.c \
+	src/network/networkd-netdev-vlan.h \
+	src/network/networkd-netdev-vlan.c \
+	src/network/networkd-netdev-macvlan.h \
+	src/network/networkd-netdev-macvlan.c \
+	src/network/networkd-netdev-ipvlan.h \
+	src/network/networkd-netdev-ipvlan.c \
+	src/network/networkd-netdev-dummy.h \
+	src/network/networkd-netdev-dummy.c \
+	src/network/networkd-netdev-tuntap.h \
+	src/network/networkd-netdev-tuntap.c \
+	src/network/networkd-netdev-bond.h \
+	src/network/networkd-netdev-bond.c \
+	src/network/networkd-netdev-bridge.h \
+	src/network/networkd-netdev-bridge.c \
+	src/network/networkd-link-bus.c \
+	src/network/networkd-ipv4ll.c \
+	src/network/networkd-dhcp4.c \
+	src/network/networkd-dhcp6.c \
+	src/network/networkd-ndisc.c \
+	src/network/networkd-network.h \
+	src/network/networkd-network.c \
+	src/network/networkd-network-bus.c \
+	src/network/networkd-address.h \
+	src/network/networkd-address.c \
+	src/network/networkd-route.h \
+	src/network/networkd-route.c \
+	src/network/networkd-manager.c \
+	src/network/networkd-manager-bus.c \
+	src/network/networkd-fdb.h \
+	src/network/networkd-fdb.c \
+	src/network/networkd-address-pool.h \
+	src/network/networkd-address-pool.c \
+	src/network/networkd-util.h \
+	src/network/networkd-util.c \
+	src/network/networkd-lldp-tx.h \
+	src/network/networkd-lldp-tx.c
+
+nodist_libnetworkd_core_la_SOURCES = \
+	src/network/networkd-gperf.c \
+	src/network/networkd-network-gperf.c \
+	src/network/networkd-netdev-gperf.c
+
+libnetworkd_core_la_LIBADD = \
+	libsystemd-network.la \
+	libshared.la
+
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-network/networkd-address-pool.c b/src/grp-network/libnetworkd-core/networkd-address-pool.c
index ebc6c9eb9e..ebc6c9eb9e 100644
--- a/src/grp-network/networkd-address-pool.c
+++ b/src/grp-network/libnetworkd-core/networkd-address-pool.c
diff --git a/src/grp-network/networkd-address-pool.h b/src/grp-network/libnetworkd-core/networkd-address-pool.h
index af30decfe0..af30decfe0 100644
--- a/src/grp-network/networkd-address-pool.h
+++ b/src/grp-network/libnetworkd-core/networkd-address-pool.h
diff --git a/src/grp-network/networkd-address.c b/src/grp-network/libnetworkd-core/networkd-address.c
index 367c340e08..367c340e08 100644
--- a/src/grp-network/networkd-address.c
+++ b/src/grp-network/libnetworkd-core/networkd-address.c
diff --git a/src/grp-network/networkd-address.h b/src/grp-network/libnetworkd-core/networkd-address.h
index 784ab18b27..784ab18b27 100644
--- a/src/grp-network/networkd-address.h
+++ b/src/grp-network/libnetworkd-core/networkd-address.h
diff --git a/src/grp-network/networkd-conf.c b/src/grp-network/libnetworkd-core/networkd-conf.c
index b67a1f6d09..b67a1f6d09 100644
--- a/src/grp-network/networkd-conf.c
+++ b/src/grp-network/libnetworkd-core/networkd-conf.c
diff --git a/src/grp-network/networkd-conf.h b/src/grp-network/libnetworkd-core/networkd-conf.h
index c7bfb42a72..c7bfb42a72 100644
--- a/src/grp-network/networkd-conf.h
+++ b/src/grp-network/libnetworkd-core/networkd-conf.h
diff --git a/src/grp-network/networkd-dhcp4.c b/src/grp-network/libnetworkd-core/networkd-dhcp4.c
index 2ddcee9db8..2ddcee9db8 100644
--- a/src/grp-network/networkd-dhcp4.c
+++ b/src/grp-network/libnetworkd-core/networkd-dhcp4.c
diff --git a/src/grp-network/networkd-dhcp6.c b/src/grp-network/libnetworkd-core/networkd-dhcp6.c
index c5a3c52e94..c5a3c52e94 100644
--- a/src/grp-network/networkd-dhcp6.c
+++ b/src/grp-network/libnetworkd-core/networkd-dhcp6.c
diff --git a/src/grp-network/networkd-fdb.c b/src/grp-network/libnetworkd-core/networkd-fdb.c
index 241f486211..241f486211 100644
--- a/src/grp-network/networkd-fdb.c
+++ b/src/grp-network/libnetworkd-core/networkd-fdb.c
diff --git a/src/grp-network/networkd-fdb.h b/src/grp-network/libnetworkd-core/networkd-fdb.h
index 84410714f5..84410714f5 100644
--- a/src/grp-network/networkd-fdb.h
+++ b/src/grp-network/libnetworkd-core/networkd-fdb.h
diff --git a/src/grp-network/networkd-gperf.gperf b/src/grp-network/libnetworkd-core/networkd-gperf.gperf
index 3fdfe74955..3fdfe74955 100644
--- a/src/grp-network/networkd-gperf.gperf
+++ b/src/grp-network/libnetworkd-core/networkd-gperf.gperf
diff --git a/src/grp-network/networkd-ipv4ll.c b/src/grp-network/libnetworkd-core/networkd-ipv4ll.c
index ae323d595b..ae323d595b 100644
--- a/src/grp-network/networkd-ipv4ll.c
+++ b/src/grp-network/libnetworkd-core/networkd-ipv4ll.c
diff --git a/src/grp-network/networkd-link-bus.c b/src/grp-network/libnetworkd-core/networkd-link-bus.c
index 532557ed6c..532557ed6c 100644
--- a/src/grp-network/networkd-link-bus.c
+++ b/src/grp-network/libnetworkd-core/networkd-link-bus.c
diff --git a/src/grp-network/networkd-link.c b/src/grp-network/libnetworkd-core/networkd-link.c
index a021fc886f..a021fc886f 100644
--- a/src/grp-network/networkd-link.c
+++ b/src/grp-network/libnetworkd-core/networkd-link.c
diff --git a/src/grp-network/networkd-link.h b/src/grp-network/libnetworkd-core/networkd-link.h
index 90cb9b93f6..90cb9b93f6 100644
--- a/src/grp-network/networkd-link.h
+++ b/src/grp-network/libnetworkd-core/networkd-link.h
diff --git a/src/grp-network/networkd-lldp-tx.c b/src/grp-network/libnetworkd-core/networkd-lldp-tx.c
index 3aa768388b..3aa768388b 100644
--- a/src/grp-network/networkd-lldp-tx.c
+++ b/src/grp-network/libnetworkd-core/networkd-lldp-tx.c
diff --git a/src/grp-network/networkd-lldp-tx.h b/src/grp-network/libnetworkd-core/networkd-lldp-tx.h
index 4680c9d950..4680c9d950 100644
--- a/src/grp-network/networkd-lldp-tx.h
+++ b/src/grp-network/libnetworkd-core/networkd-lldp-tx.h
diff --git a/src/grp-network/networkd-manager-bus.c b/src/grp-network/libnetworkd-core/networkd-manager-bus.c
index 0c429b9471..0c429b9471 100644
--- a/src/grp-network/networkd-manager-bus.c
+++ b/src/grp-network/libnetworkd-core/networkd-manager-bus.c
diff --git a/src/grp-network/networkd-manager.c b/src/grp-network/libnetworkd-core/networkd-manager.c
index 7af7abaa81..7af7abaa81 100644
--- a/src/grp-network/networkd-manager.c
+++ b/src/grp-network/libnetworkd-core/networkd-manager.c
diff --git a/src/grp-network/networkd-ndisc.c b/src/grp-network/libnetworkd-core/networkd-ndisc.c
index f3a4fc0fa5..f3a4fc0fa5 100644
--- a/src/grp-network/networkd-ndisc.c
+++ b/src/grp-network/libnetworkd-core/networkd-ndisc.c
diff --git a/src/grp-network/networkd-netdev-bond.c b/src/grp-network/libnetworkd-core/networkd-netdev-bond.c
index 7005b165d9..7005b165d9 100644
--- a/src/grp-network/networkd-netdev-bond.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-bond.c
diff --git a/src/grp-network/networkd-netdev-bond.h b/src/grp-network/libnetworkd-core/networkd-netdev-bond.h
index b941edb344..b941edb344 100644
--- a/src/grp-network/networkd-netdev-bond.h
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-bond.h
diff --git a/src/grp-network/networkd-netdev-bridge.c b/src/grp-network/libnetworkd-core/networkd-netdev-bridge.c
index 4cfd00413f..4cfd00413f 100644
--- a/src/grp-network/networkd-netdev-bridge.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-bridge.c
diff --git a/src/grp-network/networkd-netdev-bridge.h b/src/grp-network/libnetworkd-core/networkd-netdev-bridge.h
index f2ae21fc50..f2ae21fc50 100644
--- a/src/grp-network/networkd-netdev-bridge.h
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-bridge.h
diff --git a/src/grp-network/networkd-netdev-dummy.c b/src/grp-network/libnetworkd-core/networkd-netdev-dummy.c
index 6617a86c20..6617a86c20 100644
--- a/src/grp-network/networkd-netdev-dummy.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-dummy.c
diff --git a/src/grp-network/networkd-netdev-dummy.h b/src/grp-network/libnetworkd-core/networkd-netdev-dummy.h
index efe302267e..efe302267e 100644
--- a/src/grp-network/networkd-netdev-dummy.h
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-dummy.h
diff --git a/src/grp-network/networkd-netdev-gperf.gperf b/src/grp-network/libnetworkd-core/networkd-netdev-gperf.gperf
index ba04bb0165..ba04bb0165 100644
--- a/src/grp-network/networkd-netdev-gperf.gperf
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-gperf.gperf
diff --git a/src/grp-network/networkd-netdev-ipvlan.c b/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.c
index af4177e43a..af4177e43a 100644
--- a/src/grp-network/networkd-netdev-ipvlan.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.c
diff --git a/src/grp-network/networkd-netdev-ipvlan.h b/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.h
index 10d4079844..10d4079844 100644
--- a/src/grp-network/networkd-netdev-ipvlan.h
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.h
diff --git a/src/grp-network/networkd-netdev-macvlan.c b/src/grp-network/libnetworkd-core/networkd-netdev-macvlan.c
index 48e98aa51b..48e98aa51b 100644
--- a/src/grp-network/networkd-netdev-macvlan.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-macvlan.c
diff --git a/src/grp-network/networkd-netdev-macvlan.h b/src/grp-network/libnetworkd-core/networkd-netdev-macvlan.h
index 3663f4f051..3663f4f051 100644
--- a/src/grp-network/networkd-netdev-macvlan.h
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-macvlan.h
diff --git a/src/grp-network/networkd-netdev-tunnel.c b/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c
index 26a9a972f1..26a9a972f1 100644
--- a/src/grp-network/networkd-netdev-tunnel.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c
diff --git a/src/grp-network/networkd-netdev-tunnel.h b/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.h
index 7d31e7b687..7d31e7b687 100644
--- a/src/grp-network/networkd-netdev-tunnel.h
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.h
diff --git a/src/grp-network/networkd-netdev-tuntap.c b/src/grp-network/libnetworkd-core/networkd-netdev-tuntap.c
index 088a4d8d32..088a4d8d32 100644
--- a/src/grp-network/networkd-netdev-tuntap.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-tuntap.c
diff --git a/src/grp-network/networkd-netdev-tuntap.h b/src/grp-network/libnetworkd-core/networkd-netdev-tuntap.h
index 120f00a353..120f00a353 100644
--- a/src/grp-network/networkd-netdev-tuntap.h
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-tuntap.h
diff --git a/src/grp-network/networkd-netdev-veth.c b/src/grp-network/libnetworkd-core/networkd-netdev-veth.c
index 185b441c5a..185b441c5a 100644
--- a/src/grp-network/networkd-netdev-veth.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-veth.c
diff --git a/src/grp-network/networkd-netdev-veth.h b/src/grp-network/libnetworkd-core/networkd-netdev-veth.h
index e69bfbc8f0..e69bfbc8f0 100644
--- a/src/grp-network/networkd-netdev-veth.h
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-veth.h
diff --git a/src/grp-network/networkd-netdev-vlan.c b/src/grp-network/libnetworkd-core/networkd-netdev-vlan.c
index b1f4714afa..b1f4714afa 100644
--- a/src/grp-network/networkd-netdev-vlan.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-vlan.c
diff --git a/src/grp-network/networkd-netdev-vlan.h b/src/grp-network/libnetworkd-core/networkd-netdev-vlan.h
index 73aacf4a0f..73aacf4a0f 100644
--- a/src/grp-network/networkd-netdev-vlan.h
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-vlan.h
diff --git a/src/grp-network/networkd-netdev-vxlan.c b/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.c
index 363a6bdde6..363a6bdde6 100644
--- a/src/grp-network/networkd-netdev-vxlan.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.c
diff --git a/src/grp-network/networkd-netdev-vxlan.h b/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.h
index 4614c66fd1..4614c66fd1 100644
--- a/src/grp-network/networkd-netdev-vxlan.h
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.h
diff --git a/src/grp-network/networkd-netdev.c b/src/grp-network/libnetworkd-core/networkd-netdev.c
index 851a36290c..851a36290c 100644
--- a/src/grp-network/networkd-netdev.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev.c
diff --git a/src/grp-network/networkd-netdev.h b/src/grp-network/libnetworkd-core/networkd-netdev.h
index ab3f068167..ab3f068167 100644
--- a/src/grp-network/networkd-netdev.h
+++ b/src/grp-network/libnetworkd-core/networkd-netdev.h
diff --git a/src/grp-network/networkd-network-bus.c b/src/grp-network/libnetworkd-core/networkd-network-bus.c
index d6b7448a43..d6b7448a43 100644
--- a/src/grp-network/networkd-network-bus.c
+++ b/src/grp-network/libnetworkd-core/networkd-network-bus.c
diff --git a/src/grp-network/networkd-network-gperf.gperf b/src/grp-network/libnetworkd-core/networkd-network-gperf.gperf
index 03e4e3b39f..03e4e3b39f 100644
--- a/src/grp-network/networkd-network-gperf.gperf
+++ b/src/grp-network/libnetworkd-core/networkd-network-gperf.gperf
diff --git a/src/grp-network/networkd-network.c b/src/grp-network/libnetworkd-core/networkd-network.c
index dd89b3770c..dd89b3770c 100644
--- a/src/grp-network/networkd-network.c
+++ b/src/grp-network/libnetworkd-core/networkd-network.c
diff --git a/src/grp-network/networkd-network.h b/src/grp-network/libnetworkd-core/networkd-network.h
index 177bc11ec4..177bc11ec4 100644
--- a/src/grp-network/networkd-network.h
+++ b/src/grp-network/libnetworkd-core/networkd-network.h
diff --git a/src/grp-network/networkd-route.c b/src/grp-network/libnetworkd-core/networkd-route.c
index f001de772a..f001de772a 100644
--- a/src/grp-network/networkd-route.c
+++ b/src/grp-network/libnetworkd-core/networkd-route.c
diff --git a/src/grp-network/networkd-route.h b/src/grp-network/libnetworkd-core/networkd-route.h
index 39de8363ed..39de8363ed 100644
--- a/src/grp-network/networkd-route.h
+++ b/src/grp-network/libnetworkd-core/networkd-route.h
diff --git a/src/grp-network/networkd-util.c b/src/grp-network/libnetworkd-core/networkd-util.c
index 555a7c68a1..555a7c68a1 100644
--- a/src/grp-network/networkd-util.c
+++ b/src/grp-network/libnetworkd-core/networkd-util.c
diff --git a/src/grp-network/networkd-util.h b/src/grp-network/libnetworkd-core/networkd-util.h
index d5c385bea4..d5c385bea4 100644
--- a/src/grp-network/networkd-util.h
+++ b/src/grp-network/libnetworkd-core/networkd-util.h
diff --git a/src/grp-network/networkd.h b/src/grp-network/libnetworkd-core/networkd.h
index b61e03920e..b61e03920e 100644
--- a/src/grp-network/networkd.h
+++ b/src/grp-network/libnetworkd-core/networkd.h
diff --git a/src/grp-network/networkctl/Makefile b/src/grp-network/networkctl/Makefile
new file mode 100644
index 0000000000..f92d402f78
--- /dev/null
+++ b/src/grp-network/networkctl/Makefile
@@ -0,0 +1,39 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+rootbin_PROGRAMS += \
+	networkctl
+
+networkctl_SOURCES = \
+	src/network/networkctl.c
+
+networkctl_LDADD = \
+	libshared.la \
+	libsystemd-network.la
+
+dist_bashcompletion_data += \
+	shell-completion/bash/networkctl
+
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-network/networkctl.c b/src/grp-network/networkctl/networkctl.c
index 85635b59bc..85635b59bc 100644
--- a/src/grp-network/networkctl.c
+++ b/src/grp-network/networkctl/networkctl.c
diff --git a/src/grp-network/systemd-networkd-wait-online/Makefile b/src/grp-network/systemd-networkd-wait-online/Makefile
new file mode 100644
index 0000000000..12aa13c48f
--- /dev/null
+++ b/src/grp-network/systemd-networkd-wait-online/Makefile
@@ -0,0 +1,44 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+rootlibexec_PROGRAMS += \
+	systemd-networkd-wait-online
+
+systemd_networkd_wait_online_CFLAGS = \
+	$(AM_CFLAGS)
+
+systemd_networkd_wait_online_SOURCES = \
+	src/libsystemd-network/network-internal.h \
+	src/network/networkd-wait-online.h \
+	src/network/networkd-wait-online-link.h \
+	src/network/networkd-wait-online.c \
+	src/network/networkd-wait-online-manager.c \
+	src/network/networkd-wait-online-link.c
+
+systemd_networkd_wait_online_LDADD = \
+	libsystemd-network.la \
+	libshared.la
+
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-network/networkd-wait-online-link.c b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-link.c
index 971545296f..971545296f 100644
--- a/src/grp-network/networkd-wait-online-link.c
+++ b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-link.c
diff --git a/src/grp-network/networkd-wait-online-link.h b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-link.h
index dc35085c55..dc35085c55 100644
--- a/src/grp-network/networkd-wait-online-link.h
+++ b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-link.h
diff --git a/src/grp-network/networkd-wait-online-manager.c b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-manager.c
index 2ff7ddb044..2ff7ddb044 100644
--- a/src/grp-network/networkd-wait-online-manager.c
+++ b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-manager.c
diff --git a/src/grp-network/networkd-wait-online.c b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online.c
index a08272463e..a08272463e 100644
--- a/src/grp-network/networkd-wait-online.c
+++ b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online.c
diff --git a/src/grp-network/networkd-wait-online.h b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online.h
index 7ac7f4018a..7ac7f4018a 100644
--- a/src/grp-network/networkd-wait-online.h
+++ b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online.h
diff --git a/src/grp-network/systemd-networkd/Makefile b/src/grp-network/systemd-networkd/Makefile
new file mode 100644
index 0000000000..8b7e44062b
--- /dev/null
+++ b/src/grp-network/systemd-networkd/Makefile
@@ -0,0 +1,40 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+rootlibexec_PROGRAMS += \
+	systemd-networkd
+
+systemd_networkd_SOURCES = \
+	src/network/networkd.c
+
+systemd_networkd_LDADD = \
+	libnetworkd-core.la
+
+ifneq ($(HAVE_LIBIPTC),)
+systemd_networkd_LDADD += \
+	libfirewall.la
+endif # HAVE_LIBIPTC
+
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-network/networkd.c b/src/grp-network/systemd-networkd/networkd.c
index 9f5c75ac3d..9f5c75ac3d 100644
--- a/src/grp-network/networkd.c
+++ b/src/grp-network/systemd-networkd/networkd.c