Fri Jun 19 06:51:06 PDT 2015

Makefile-man.am                              |  947 +++++++++++++--------------
 Makefile.am                                  |   42 -
 NEWS                                         |   83 ++
 TODO                                         |   21 
 configure.ac                                 |   13 
 hwdb/20-OUI.hwdb                             |  162 ++++
 hwdb/20-pci-vendor-model.hwdb                |  848 +++++++++++++-----------
 hwdb/20-usb-vendor-model.hwdb                |  240 ++++++
 man/binfmt.d.xml                             |    5 
 man/bootchart.conf.xml                       |   17 
 man/bootctl.xml                              |    5 
 man/bootup.xml                               |    5 
 man/busctl.xml                               |    5 
 man/coredump.conf.xml                        |   11 
 man/coredumpctl.xml                          |    5 
 man/crypttab.xml                             |    5 
 man/daemon.xml                               |    5 
 man/file-hierarchy.xml                       |    5 
 man/halt.xml                                 |    5 
 man/hostname.xml                             |    5 
 man/hostnamectl.xml                          |    5 
 man/hwdb.xml                                 |   18 
 man/journal-remote.conf.xml                  |   11 
 man/journalctl.xml                           |    5 
 man/journald.conf.xml                        |   11 
 man/kernel-command-line.xml                  |    5 
 man/kernel-install.xml                       |    5 
 man/less-variables.xml                       |    5 
 man/libsystemd-pkgconfig.xml                 |    5 
 man/locale.conf.xml                          |    5 
 man/localectl.xml                            |    5 
 man/localtime.xml                            |    5 
 man/loginctl.xml                             |    5 
 man/logind.conf.xml                          |   11 
 man/machine-id.xml                           |    5 
 man/machine-info.xml                         |    5 
 man/machinectl.xml                           |    9 
 man/modules-load.d.xml                       |    5 
 man/networkctl.xml                           |    5 
 man/nss-myhostname.xml                       |    5 
 man/nss-mymachines.xml                       |    5 
 man/os-release.xml                           |    5 
 man/pam_systemd.xml                          |    5 
 man/resolved.conf.xml                        |   11 
 man/runlevel.xml                             |    5 
 man/sd-daemon.xml                            |    5 
 man/sd-id128.xml                             |    5 
 man/sd-journal.xml                           |    5 
 man/sd-login.xml                             |    5 
 man/sd_booted.xml                            |    5 
 man/sd_bus_creds_get_pid.xml                 |    5 
 man/sd_bus_creds_new_from_pid.xml            |    5 
 man/sd_bus_default.xml                       |    5 
 man/sd_bus_error.xml                         |    5 
 man/sd_bus_message_append.xml                |    5 
 man/sd_bus_message_append_array.xml          |    5 
 man/sd_bus_message_append_basic.xml          |    5 
 man/sd_bus_message_append_string_memfd.xml   |    5 
 man/sd_bus_message_append_strv.xml           |    5 
 man/sd_bus_message_get_cookie.xml            |    5 
 man/sd_bus_message_get_monotonic_usec.xml    |    5 
 man/sd_bus_negotiate_fds.xml                 |    5 
 man/sd_bus_new.xml                           |    5 
 man/sd_bus_path_encode.xml                   |    5 
 man/sd_bus_request_name.xml                  |    5 
 man/sd_event_add_child.xml                   |    5 
 man/sd_event_add_defer.xml                   |    5 
 man/sd_event_add_signal.xml                  |    5 
 man/sd_event_add_time.xml                    |    5 
 man/sd_event_get_fd.xml                      |    5 
 man/sd_event_new.xml                         |    5 
 man/sd_event_run.xml                         |    5 
 man/sd_event_set_name.xml                    |    5 
 man/sd_event_wait.xml                        |    5 
 man/sd_get_seats.xml                         |    5 
 man/sd_id128_get_machine.xml                 |    5 
 man/sd_id128_randomize.xml                   |    5 
 man/sd_id128_to_string.xml                   |    5 
 man/sd_is_fifo.xml                           |    5 
 man/sd_journal_add_match.xml                 |    5 
 man/sd_journal_get_catalog.xml               |    5 
 man/sd_journal_get_cursor.xml                |    5 
 man/sd_journal_get_cutoff_realtime_usec.xml  |    5 
 man/sd_journal_get_data.xml                  |    5 
 man/sd_journal_get_fd.xml                    |    5 
 man/sd_journal_get_realtime_usec.xml         |    5 
 man/sd_journal_get_usage.xml                 |    5 
 man/sd_journal_next.xml                      |    5 
 man/sd_journal_open.xml                      |    5 
 man/sd_journal_print.xml                     |    5 
 man/sd_journal_query_unique.xml              |    5 
 man/sd_journal_seek_head.xml                 |    5 
 man/sd_journal_stream_fd.xml                 |    5 
 man/sd_listen_fds.xml                        |    5 
 man/sd_login_monitor_new.xml                 |    5 
 man/sd_machine_get_class.xml                 |    5 
 man/sd_notify.xml                            |    5 
 man/sd_pid_get_session.xml                   |    5 
 man/sd_seat_get_active.xml                   |    5 
 man/sd_session_is_active.xml                 |    5 
 man/sd_uid_get_state.xml                     |    5 
 man/sd_watchdog_enabled.xml                  |    5 
 man/shutdown.xml                             |    5 
 man/standard-conf.xml                        |    9 
 man/standard-options.xml                     |    5 
 man/sysctl.d.xml                             |    7 
 man/systemd-activate.xml                     |   11 
 man/systemd-analyze.xml                      |    5 
 man/systemd-ask-password-console.service.xml |    5 
 man/systemd-ask-password.xml                 |    5 
 man/systemd-backlight at .service.xml           |    7 
 man/systemd-binfmt.service.xml               |    7 
 man/systemd-bootchart.xml                    |   13 
 man/systemd-bus-proxyd.xml                   |    9 
 man/systemd-bus-proxyd at .service.xml          |    7 
 man/systemd-cat.xml                          |    5 
 man/systemd-cgls.xml                         |    5 
 man/systemd-cgtop.xml                        |    5 
 man/systemd-coredump.xml                     |    7 
 man/systemd-cryptsetup-generator.xml         |    7 
 man/systemd-cryptsetup at .service.xml          |    7 
 man/systemd-debug-generator.xml              |    7 
 man/systemd-delta.xml                        |    5 
 man/systemd-detect-virt.xml                  |    5 
 man/systemd-efi-boot-generator.xml           |    7 
 man/systemd-escape.xml                       |    5 
 man/systemd-firstboot.xml                    |    5 
 man/systemd-fsck at .service.xml                |    7 
 man/systemd-fstab-generator.xml              |    7 
 man/systemd-getty-generator.xml              |    7 
 man/systemd-gpt-auto-generator.xml           |    7 
 man/systemd-halt.service.xml                 |   11 
 man/systemd-hibernate-resume-generator.xml   |    7 
 man/systemd-hibernate-resume at .service.xml    |    7 
 man/systemd-hostnamed.service.xml            |    7 
 man/systemd-hwdb.xml                         |    7 
 man/systemd-inhibit.xml                      |    5 
 man/systemd-initctl.service.xml              |    7 
 man/systemd-journal-gatewayd.service.xml     |    7 
 man/systemd-journal-remote.xml               |    5 
 man/systemd-journal-upload.xml               |    9 
 man/systemd-journald.service.xml             |    9 
 man/systemd-localed.service.xml              |    7 
 man/systemd-logind.service.xml               |    7 
 man/systemd-machine-id-commit.service.xml    |    7 
 man/systemd-machine-id-commit.xml            |    5 
 man/systemd-machine-id-setup.xml             |    5 
 man/systemd-machined.service.xml             |    7 
 man/systemd-modules-load.service.xml         |    7 
 man/systemd-networkd-wait-online.service.xml |    7 
 man/systemd-networkd.service.xml             |   11 
 man/systemd-notify.xml                       |    5 
 man/systemd-nspawn.xml                       |    5 
 man/systemd-path.xml                         |    5 
 man/systemd-quotacheck.service.xml           |    7 
 man/systemd-random-seed.service.xml          |    7 
 man/systemd-remount-fs.service.xml           |    7 
 man/systemd-resolved.service.xml             |    7 
 man/systemd-rfkill at .service.xml              |    7 
 man/systemd-run.xml                          |    5 
 man/systemd-sleep.conf.xml                   |   13 
 man/systemd-socket-proxyd.xml                |    9 
 man/systemd-suspend.service.xml              |   13 
 man/systemd-sysctl.service.xml               |    7 
 man/systemd-system-update-generator.xml      |    7 
 man/systemd-system.conf.xml                  |   17 
 man/systemd-sysusers.xml                     |    5 
 man/systemd-sysv-generator.xml               |    7 
 man/systemd-timedated.service.xml            |    7 
 man/systemd-timesyncd.service.xml            |    7 
 man/systemd-tmpfiles.xml                     |    5 
 man/systemd-tty-ask-password-agent.xml       |    5 
 man/systemd-udevd.service.xml                |    7 
 man/systemd-update-done.service.xml          |    7 
 man/systemd-update-utmp.service.xml          |    7 
 man/systemd-user-sessions.service.xml        |    7 
 man/systemd-vconsole-setup.service.xml       |    7 
 man/systemd.automount.xml                    |    5 
 man/systemd.device.xml                       |    5 
 man/systemd.exec.xml                         |    5 
 man/systemd.generator.xml                    |    4 
 man/systemd.journal-fields.xml               |    5 
 man/systemd.kill.xml                         |    5 
 man/systemd.link.xml                         |   15 
 man/systemd.mount.xml                        |    5 
 man/systemd.netdev.xml                       |   31 
 man/systemd.network.xml                      |   29 
 man/systemd.path.xml                         |    5 
 man/systemd.preset.xml                       |   21 
 man/systemd.resource-control.xml             |    5 
 man/systemd.scope.xml                        |    5 
 man/systemd.service.xml                      |    5 
 man/systemd.slice.xml                        |    5 
 man/systemd.snapshot.xml                     |    5 
 man/systemd.socket.xml                       |    5 
 man/systemd.special.xml                      |    5 
 man/systemd.swap.xml                         |    7 
 man/systemd.target.xml                       |    5 
 man/systemd.time.xml                         |    5 
 man/systemd.timer.xml                        |    5 
 man/systemd.unit.xml                         |   30 
 man/systemd.xml                              |    7 
 man/sysusers.d.xml                           |    5 
 man/telinit.xml                              |    5 
 man/timedatectl.xml                          |    9 
 man/timesyncd.conf.xml                       |   11 
 man/tmpfiles.d.xml                           |    5 
 man/udev.conf.xml                            |    5 
 man/udev.xml                                 |   13 
 man/udev_device_new_from_syspath.xml         |   74 ++
 man/udevadm.xml                              |    5 
 man/user-system-options.xml                  |    5 
 man/vconsole.conf.xml                        |    5 
 po/be.po                                     |   10 
 po/be at latin.po                               |   75 +-
 po/de.po                                     |    2 
 po/el.po                                     |  217 ++++--
 po/es.po                                     |    2 
 po/fr.po                                     |    2 
 po/hu.po                                     |    2 
 po/it.po                                     |    2 
 po/pl.po                                     |    2 
 po/pt_BR.po                                  |    2 
 po/ru.po                                     |    2 
 po/sv.po                                     |    2 
 po/uk.po                                     |    2 
 po/zh_TW.po                                  |   82 --
 shell-completion/zsh/_loginctl               |   64 +
 src/basic/cgroup-util.c                      |    2 
 src/basic/def.h                              |    8 
 src/basic/exit-status.c                      |    1 
 src/basic/hashmap.c                          |   10 
 src/basic/hashmap.h                          |    1 
 src/basic/util.c                             |  125 +--
 src/basic/util.h                             |    6 
 src/bus-proxyd/bus-proxyd.c                  |    4 
 src/bus-proxyd/proxy.c                       |    8 
 src/bus-proxyd/stdio-bridge.c                |    4 
 src/core/execute.c                           |    2 
 src/core/kmod-setup.c                        |    2 
 src/core/load-fragment-gperf.gperf.m4        |    4 
 src/core/load-fragment.c                     |  226 +++---
 src/core/manager.c                           |    2 
 src/core/mount-setup.c                       |    2 
 src/core/service.c                           |    4 
 src/import/pull.c                            |   16 
 src/journal/test-journal-interleaving.c      |    9 
 src/journal/test-journal-stream.c            |    9 
 src/libsystemd-network/sd-dhcp-client.c      |    2 
 src/libsystemd/sd-bus/sd-bus.c               |   21 
 src/libudev/libudev-device.c                 |    2 
 src/login/logind-user.c                      |   31 
 src/login/pam_systemd.c                      |    3 
 src/machine/machine-dbus.c                   |    4 
 src/network/networkd-netdev-vlan.c           |    8 
 src/nspawn/nspawn.c                          |   15 
 src/shared/acl-util.c                        |   13 
 src/shared/acl-util.h                        |    2 
 src/shared/bus-util.c                        |   23 
 src/shared/logs-show.c                       |    4 
 src/shared/watchdog.c                        |    9 
 src/systemctl/systemctl.c                    |   37 -
 src/test/test-barrier.c                      |   10 
 src/test/test-hashmap.c                      |   43 -
 src/test/test-unit-file.c                    |   72 +-
 src/test/test-util.c                         |  239 ++++++
 src/udev/udevd.c                             |    6 
 sysusers.d/systemd.conf.m4                   |    2 
 units/systemd-networkd.service.m4.in         |    2 
 units/systemd-resolved.service.m4.in         |    2 
 270 files changed, 2842 insertions(+), 2406 deletions(-)

New commits:
commit ff99498535bbc97601d89925fd81cd3ac9120994
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Jun 19 02:13:03 2015 +0200

    po: run make update-po

diff --git a/po/be.po b/po/be.po
index 8746d34..6e5661f 100644
--- a/po/be.po
+++ b/po/be.po
@@ -7,12 +7,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: systemd master\n"
-"Report-Msgid-Bugs-To: https://github.com/systemd/systemd/issues\n"
-"POT-Creation-Date: 2015-06-08 23:20+0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-06-18 00:53+0200\n"
 "PO-Revision-Date: 2015-06-14 11:17+0300\n"
 "Last-Translator: Viktar Vaŭčkievič <victorenator at gmail.com>\n"
-"Language: be\n"
 "Language-Team: \n"
+"Language: be\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -188,8 +188,8 @@ msgid ""
 "Authentication is required for an application to inhibit automatic system "
 "suspend."
 msgstr ""
-"Неабходна аўтэнтыфікацыя для дазволу праграмам перашкаджаць "
-"аўтаматычнаму прыпыненню сістэмы."
+"Неабходна аўтэнтыфікацыя для дазволу праграмам перашкаджаць аўтаматычнаму "
+"прыпыненню сістэмы."
 
 #: ../src/login/org.freedesktop.login1.policy.in.h:11
 msgid "Allow applications to inhibit system handling of the power key"
diff --git a/po/be at latin.po b/po/be at latin.po
index 16c003b..a3a5cf6 100644
--- a/po/be at latin.po
+++ b/po/be at latin.po
@@ -7,12 +7,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: systemd master\n"
-"Report-Msgid-Bugs-To: https://github.com/systemd/systemd/issues\n"
-"POT-Creation-Date: 2015-06-08 23:20+0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-06-18 00:53+0200\n"
 "PO-Revision-Date: 2015-06-14 11:17+0300\n"
 "Last-Translator: Viktar Vaŭčkievič <victorenator at gmail.com>\n"
-"Language: be\n"
 "Language-Team: \n"
+"Language: be\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -46,8 +46,8 @@ msgstr "Kiravać fajlami servisaŭ i inšych sistemnych adzinak"
 #: ../src/core/org.freedesktop.systemd1.policy.in.in.h:6
 msgid "Authentication is required to manage system service or unit files."
 msgstr ""
-"Nieabchodna aŭtentyfikacyja dlia kiravannia fajlami servisaŭ i inšych sistemnych "
-"adzinak."
+"Nieabchodna aŭtentyfikacyja dlia kiravannia fajlami servisaŭ i inšych "
+"sistemnych adzinak."
 
 #: ../src/core/org.freedesktop.systemd1.policy.in.in.h:7
 msgid "Set or unset system and service manager environment variables"
@@ -58,8 +58,8 @@ msgid ""
 "Authentication is required to set or unset system and service manager "
 "environment variables."
 msgstr ""
-"Nieabchodna aŭtentyfikacyja dlia ŭstaliavannia abo skidu zmiennych asiaroddzia "
-"sistemnaha menedžera."
+"Nieabchodna aŭtentyfikacyja dlia ŭstaliavannia abo skidu zmiennych "
+"asiaroddzia sistemnaha menedžera."
 
 #: ../src/core/org.freedesktop.systemd1.policy.in.in.h:9
 msgid "Reload the systemd state"
@@ -86,8 +86,8 @@ msgid ""
 "Authentication is required to set the statically configured local host name, "
 "as well as the pretty host name."
 msgstr ""
-"Nieabchodna aŭtentyfikacyja dlia ŭstaliavannia jak statyčnaha tak i pryhožaha imia "
-"vuzla."
+"Nieabchodna aŭtentyfikacyja dlia ŭstaliavannia jak statyčnaha tak i "
+"pryhožaha imia vuzla."
 
 #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:5
 msgid "Set machine information"
@@ -96,7 +96,8 @@ msgstr "Ustaliavać infarmacyju ab mašynie"
 #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:6
 msgid "Authentication is required to set local machine information."
 msgstr ""
-"Nieabchodna aŭtentyfikacyja dlia ŭstaliavannia infarmacyi ab lakaĺnaj mašynie."
+"Nieabchodna aŭtentyfikacyja dlia ŭstaliavannia infarmacyi ab lakaĺnaj "
+"mašynie."
 
 #: ../src/import/org.freedesktop.import1.policy.in.h:1
 msgid "Import a VM or container image"
@@ -136,7 +137,8 @@ msgstr "Ustaliavać sistemnyja nalady klavijatury"
 
 #: ../src/locale/org.freedesktop.locale1.policy.in.h:4
 msgid "Authentication is required to set the system keyboard settings."
-msgstr "Nieabchodna aŭtentyfikacyja dlia ŭstaliavannia sistemnych nalad klavijatury."
+msgstr ""
+"Nieabchodna aŭtentyfikacyja dlia ŭstaliavannia sistemnych nalad klavijatury."
 
 #: ../src/login/org.freedesktop.login1.policy.in.h:1
 msgid "Allow applications to inhibit system shutdown"
@@ -251,8 +253,8 @@ msgstr ""
 #: ../src/login/org.freedesktop.login1.policy.in.h:20
 msgid "Authentication is required to run programs as a non-logged-in user."
 msgstr ""
-"Nieabchodna aŭtentyfikacyja dlia vykanannia prahram karystaĺnika, jaki jašče nie "
-"ŭvajšoŭ u sistemu."
+"Nieabchodna aŭtentyfikacyja dlia vykanannia prahram karystaĺnika, jaki jašče "
+"nie ŭvajšoŭ u sistemu."
 
 #: ../src/login/org.freedesktop.login1.policy.in.h:21
 msgid "Allow attaching devices to seats"
@@ -260,7 +262,8 @@ msgstr "Dazvolić dalučać prylady da pracoŭnych miescaŭ"
 
 #: ../src/login/org.freedesktop.login1.policy.in.h:22
 msgid "Authentication is required for attaching a device to a seat."
-msgstr "Nieabchodna aŭtentyfikacyja dlia dalučennia prylad da pracoŭnych miescaŭ."
+msgstr ""
+"Nieabchodna aŭtentyfikacyja dlia dalučennia prylad da pracoŭnych miescaŭ."
 
 #: ../src/login/org.freedesktop.login1.policy.in.h:23
 msgid "Flush device to seat attachments"
@@ -269,7 +272,8 @@ msgstr "Adkliučać prylady ad pracoŭnych miescaŭ"
 #: ../src/login/org.freedesktop.login1.policy.in.h:24
 msgid ""
 "Authentication is required for resetting how devices are attached to seats."
-msgstr "Nieabchodna aŭtentyfikacyja dlia adkliučennia prylad ad pracoŭnych miescaŭ."
+msgstr ""
+"Nieabchodna aŭtentyfikacyja dlia adkliučennia prylad ad pracoŭnych miescaŭ."
 
 #: ../src/login/org.freedesktop.login1.policy.in.h:25
 msgid "Power off the system"
@@ -300,8 +304,8 @@ msgid ""
 "Authentication is required for powering off the system while an application "
 "asked to inhibit it."
 msgstr ""
-"Nieabchodna aŭtentyfikacyja dlia vykliučennia sistemy, kali prahramy pieraškadžajuć "
-"hetamu."
+"Nieabchodna aŭtentyfikacyja dlia vykliučennia sistemy, kali prahramy "
+"pieraškadžajuć hetamu."
 
 #: ../src/login/org.freedesktop.login1.policy.in.h:31
 msgid "Reboot the system"
@@ -320,8 +324,8 @@ msgid ""
 "Authentication is required for rebooting the system while other users are "
 "logged in."
 msgstr ""
-"Nieabchodna aŭtentyfikacyja dlia pierazahruzki sistemy pry prysutnasci inšych "
-"karystaĺnikaŭ."
+"Nieabchodna aŭtentyfikacyja dlia pierazahruzki sistemy pry prysutnasci "
+"inšych karystaĺnikaŭ."
 
 #: ../src/login/org.freedesktop.login1.policy.in.h:35
 msgid "Reboot the system while an application asked to inhibit it"
@@ -364,8 +368,8 @@ msgid ""
 "Authentication is required for suspending the system while an application "
 "asked to inhibit it."
 msgstr ""
-"Nieabchodna aŭtentyfikacyja dlia prypyniennia sistemy, kali prahramy pieraškadžajuć "
-"hetamu."
+"Nieabchodna aŭtentyfikacyja dlia prypyniennia sistemy, kali prahramy "
+"pieraškadžajuć hetamu."
 
 #: ../src/login/org.freedesktop.login1.policy.in.h:43
 msgid "Hibernate the system"
@@ -396,8 +400,8 @@ msgid ""
 "Authentication is required for hibernating the system while an application "
 "asked to inhibit it."
 msgstr ""
-"Nieabchodna aŭtentyfikacyja dlia hibiernacyi sistemy, kali prahramy pieraškadžajuć "
-"hetamu."
+"Nieabchodna aŭtentyfikacyja dlia hibiernacyi sistemy, kali prahramy "
+"pieraškadžajuć hetamu."
 
 #: ../src/login/org.freedesktop.login1.policy.in.h:49
 msgid "Manage active sessions, users and seats"
@@ -407,8 +411,8 @@ msgstr "Kiravać aktyŭnymi siesijami, karystaĺnikami i pracoŭnymi miescami"
 msgid ""
 "Authentication is required for managing active sessions, users and seats."
 msgstr ""
-"Nieabchodna aŭtentyfikacyja dlia kiravannia aktyŭnymi siesijami, karystaĺnikami i "
-"miescami."
+"Nieabchodna aŭtentyfikacyja dlia kiravannia aktyŭnymi siesijami, "
+"karystaĺnikami i miescami."
 
 #: ../src/login/org.freedesktop.login1.policy.in.h:51
 msgid "Lock or unlock active sessions"
@@ -417,7 +421,8 @@ msgstr "Blakiravać abo razblakiravać aktyŭnuju siesiju"
 #: ../src/login/org.freedesktop.login1.policy.in.h:52
 msgid "Authentication is required to lock or unlock active sessions."
 msgstr ""
-"Nieabchodna aŭtentyfikacyja dlia blakiroŭki abo razblakiroŭki aktyŭnaj siesii."
+"Nieabchodna aŭtentyfikacyja dlia blakiroŭki abo razblakiroŭki aktyŭnaj "
+"siesii."
 
 #: ../src/login/org.freedesktop.login1.policy.in.h:53
 msgid "Allow indication to the firmware to boot to setup interface"
@@ -428,7 +433,8 @@ msgid ""
 "Authentication is required to indicate to the firmware to boot to setup "
 "interface."
 msgstr ""
-"Nieabchodna aŭtentyfikacyja dlia ŭkazannia prašyŭcy na zahruzku interfiejsu nalad."
+"Nieabchodna aŭtentyfikacyja dlia ŭkazannia prašyŭcy na zahruzku interfiejsu "
+"nalad."
 
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:1
 msgid "Log into a local container"
@@ -458,8 +464,8 @@ msgid ""
 "Authentication is required to manage local virtual machine and container "
 "images."
 msgstr ""
-"Nieabchodna aŭtentyfikacyja dlia kiravannia vobrazami lakaĺnych virtuaĺnych mašyn "
-"i kantejnieraŭ."
+"Nieabchodna aŭtentyfikacyja dlia kiravannia vobrazami lakaĺnych virtuaĺnych "
+"mašyn i kantejnieraŭ."
 
 #: ../src/timedate/org.freedesktop.timedate1.policy.in.h:1
 msgid "Set system time"
@@ -475,7 +481,8 @@ msgstr "Ustaliavać sistemny časavy pojas"
 
 #: ../src/timedate/org.freedesktop.timedate1.policy.in.h:4
 msgid "Authentication is required to set the system timezone."
-msgstr "Nieabchodna aŭtentyfikacyja dlia ŭstaliavannia sistemnaha časavoha pojasu."
+msgstr ""
+"Nieabchodna aŭtentyfikacyja dlia ŭstaliavannia sistemnaha časavoha pojasu."
 
 #: ../src/timedate/org.freedesktop.timedate1.policy.in.h:5
 msgid "Set RTC to local timezone or UTC"
@@ -486,8 +493,8 @@ msgid ""
 "Authentication is required to control whether the RTC stores the local or "
 "UTC time."
 msgstr ""
-"Nieabchodna aŭtentyfikacyja dlia ŭstaliavannia časavoha pojasu (miascovy abo UTC), u "
-"jakim zachoŭvajecca čas u RTC."
+"Nieabchodna aŭtentyfikacyja dlia ŭstaliavannia časavoha pojasu (miascovy abo "
+"UTC), u jakim zachoŭvajecca čas u RTC."
 
 #: ../src/timedate/org.freedesktop.timedate1.policy.in.h:7
 msgid "Turn network time synchronization on or off"
@@ -498,5 +505,5 @@ msgid ""
 "Authentication is required to control whether network time synchronization "
 "shall be enabled."
 msgstr ""
-"Nieabchodna aŭtentyfikacyja dlia ŭkliučennia abo vykliučennia sinchranizacyi času pa "
-"sietcy."
+"Nieabchodna aŭtentyfikacyja dlia ŭkliučennia abo vykliučennia sinchranizacyi "
+"času pa sietcy."
diff --git a/po/de.po b/po/de.po
index bd64063..fa13d34 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: systemd master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-10 23:25+0200\n"
+"POT-Creation-Date: 2015-06-18 00:53+0200\n"
 "PO-Revision-Date: 2015-02-18 17:08+0100\n"
 "Last-Translator: Martin Pitt <martin.pitt at ubuntu.com>\n"
 "Language-Team: German <gnome-de at gnome.org>\n"
diff --git a/po/el.po b/po/el.po
index 14ee497..95cde04 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: systemd master\n"
-"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=sys"
-"temd&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-04-25 15:51+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-06-18 00:53+0200\n"
 "PO-Revision-Date: 2014-04-29 09:17+0300\n"
 "Last-Translator: Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32 at gmail.com>\n"
 "Language-Team: team at lists.gnome.gr\n"
@@ -19,6 +18,63 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Virtaal 0.7.0\n"
 
+#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:1
+msgid "Send passphrase back to system"
+msgstr "Αποστολή του συνθηματικού πίσω στο σύστημα"
+
+#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:2
+msgid ""
+"Authentication is required to send the entered passphrase back to the system."
+msgstr ""
+"Απαιτείται πιστοποίηση για αποστολή του εισερχόμενου συνθηματικού πίσω στο "
+"σύστημα."
+
+#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:3
+msgid "Manage system services or other units"
+msgstr ""
+
+#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:4
+#, fuzzy
+msgid "Authentication is required to manage system services or other units."
+msgstr ""
+"Απαιτείται πιστοποίηση για να προσπελάσετε τον διαχειριστή συστήματος και "
+"υπηρεσιών."
+
+#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:5
+msgid "Manage system service or unit files"
+msgstr ""
+
+#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:6
+#, fuzzy
+msgid "Authentication is required to manage system service or unit files."
+msgstr ""
+"Απαιτείται πιστοποίηση για να προσπελάσετε τον διαχειριστή συστήματος και "
+"υπηρεσιών."
+
+#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:7
+#, fuzzy
+msgid "Set or unset system and service manager environment variables"
+msgstr "Προνομιούχος πρόσβαση διαχειριστή συστήματος και υπηρεσίας"
+
+#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:8
+#, fuzzy
+msgid ""
+"Authentication is required to set or unset system and service manager "
+"environment variables."
+msgstr ""
+"Απαιτείται πιστοποίηση για να προσπελάσετε τον διαχειριστή συστήματος και "
+"υπηρεσιών."
+
+#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:9
+#, fuzzy
+msgid "Reload the systemd state"
+msgstr "Επανεκκίνηση του συστήματος"
+
+#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:10
+#, fuzzy
+msgid "Authentication is required to reload the systemd state."
+msgstr "Απαιτείται πιστοποίηση για να ορίσετε την ώρα του συστήματος."
+
 #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:1
 msgid "Set host name"
 msgstr "Ορισμός ονόματος οικοδεσπότη"
@@ -47,6 +103,33 @@ msgstr "Ορισμός πληροφοριών μηχανής"
 msgid "Authentication is required to set local machine information."
 msgstr "Απαιτείται πιστοποίηση για να ορίσετε πληροφορίες τοπικής μηχανής."
 
+#: ../src/import/org.freedesktop.import1.policy.in.h:1
+msgid "Import a VM or container image"
+msgstr ""
+
+#: ../src/import/org.freedesktop.import1.policy.in.h:2
+#, fuzzy
+msgid "Authentication is required to import a VM or container image"
+msgstr "Απαιτείται πιστοποίηση για να ορίσετε την ώρα του συστήματος."
+
+#: ../src/import/org.freedesktop.import1.policy.in.h:3
+msgid "Export a VM or container image"
+msgstr ""
+
+#: ../src/import/org.freedesktop.import1.policy.in.h:4
+#, fuzzy
+msgid "Authentication is required to export a VM or container image"
+msgstr "Απαιτείται πιστοποίηση για να ορίσετε την ώρα του συστήματος."
+
+#: ../src/import/org.freedesktop.import1.policy.in.h:5
+msgid "Download a VM or container image"
+msgstr ""
+
+#: ../src/import/org.freedesktop.import1.policy.in.h:6
+#, fuzzy
+msgid "Authentication is required to download a VM or container image"
+msgstr "Απαιτείται πιστοποίηση για να ορίσετε πληροφορίες τοπικής μηχανής."
+
 #: ../src/locale/org.freedesktop.locale1.policy.in.h:1
 msgid "Set system locale"
 msgstr "Ορισμός τοπικών ρυθμίσεων συστήματος"
@@ -73,8 +156,7 @@ msgstr ""
 
 #: ../src/login/org.freedesktop.login1.policy.in.h:2
 msgid ""
-"Authentication is required for an application to inhibit system "
-"shutdown."
+"Authentication is required for an application to inhibit system shutdown."
 msgstr ""
 "Απαιτείται πιστοποίηση για να επιτρέπεται σε μια εφαρμογή να αποτρέψει τον "
 "τερματισμό του συστήματος."
@@ -85,8 +167,7 @@ msgstr ""
 "Να επιτρέπεται στις εφαρμογές να καθυστερούν τον τερματισμό του συστήματος"
 
 #: ../src/login/org.freedesktop.login1.policy.in.h:4
-msgid ""
-"Authentication is required for an application to delay system shutdown."
+msgid "Authentication is required for an application to delay system shutdown."
 msgstr ""
 "Απαιτείται πιστοποίηση για να επιτρέπεται σε μια εφαρμογή να καθυστερήσει "
 "τον τερματισμό του συστήματος."
@@ -96,8 +177,7 @@ msgid "Allow applications to inhibit system sleep"
 msgstr "Να επιτρέπεται στις εφαρμογές να αποτρέπουν την ύπνωση του συστήματος"
 
 #: ../src/login/org.freedesktop.login1.policy.in.h:6
-msgid ""
-"Authentication is required for an application to inhibit system sleep."
+msgid "Authentication is required for an application to inhibit system sleep."
 msgstr ""
 "Απαιτείται πιστοποίηση για να επιτρέπεται σε μια εφαρμογή να αποτρέψει την "
 "ύπνωση του συστήματος."
@@ -107,8 +187,7 @@ msgid "Allow applications to delay system sleep"
 msgstr "Να επιτρέπεται στις εφαρμογές να καθυστερούν την ύπνωση του συστήματος"
 
 #: ../src/login/org.freedesktop.login1.policy.in.h:8
-msgid ""
-"Authentication is required for an application to delay system sleep."
+msgid "Authentication is required for an application to delay system sleep."
 msgstr ""
 "Απαιτείται πιστοποίηση για να επιτρέπεται σε μια εφαρμογή να καθυστερήσει "
 "την ύπνωση του συστήματος."
@@ -121,8 +200,8 @@ msgstr ""
 
 #: ../src/login/org.freedesktop.login1.policy.in.h:10
 msgid ""
-"Authentication is required for an application to inhibit automatic "
-"system suspend."
+"Authentication is required for an application to inhibit automatic system "
+"suspend."
 msgstr ""
 "Απαιτείται πιστοποίηση για να επιτρέπεται σε μια εφαρμογή να αποτρέψει την "
 "αυτόματη αναστολή του συστήματος."
@@ -135,8 +214,8 @@ msgstr ""
 
 #: ../src/login/org.freedesktop.login1.policy.in.h:12
 msgid ""
-"Authentication is required for an application to inhibit system "
-"handling of the power key."
+"Authentication is required for an application to inhibit system handling of "
+"the power key."
 msgstr ""
 "Απαιτείται πιστοποίηση για να επιτρέπεται σε μια εφαρμογή να αποτρέψει την "
 "διαχείριση του πλήκτρου ενεργοποίησης του συστήματος."
@@ -149,8 +228,8 @@ msgstr ""
 
 #: ../src/login/org.freedesktop.login1.policy.in.h:14
 msgid ""
-"Authentication is required for an application to inhibit system "
-"handling of the suspend key."
+"Authentication is required for an application to inhibit system handling of "
+"the suspend key."
 msgstr ""
 "Απαιτείται πιστοποίηση για να επιτρέπεται σε μια εφαρμογή να αποτρέψει την "
 "διαχείριση του πλήκτρου αναστολής του συστήματος."
@@ -163,8 +242,8 @@ msgstr ""
 
 #: ../src/login/org.freedesktop.login1.policy.in.h:16
 msgid ""
-"Authentication is required for an application to inhibit system "
-"handling of the hibernate key."
+"Authentication is required for an application to inhibit system handling of "
+"the hibernate key."
 msgstr ""
 "Απαιτείται πιστοποίηση για να επιτρέπεται σε μια εφαρμογή να αποτρέψει την "
 "διαχείριση του πλήκτρου αδρανοποίησης του συστήματος."
@@ -177,8 +256,8 @@ msgstr ""
 
 #: ../src/login/org.freedesktop.login1.policy.in.h:18
 msgid ""
-"Authentication is required for an application to inhibit system "
-"handling of the lid switch."
+"Authentication is required for an application to inhibit system handling of "
+"the lid switch."
 msgstr ""
 "Απαιτείται πιστοποίηση για να επιτρέπεται σε μια εφαρμογή να αποτρέψει την "
 "διαχείριση του διακόπτη καλύμματος του συστήματος."
@@ -188,8 +267,7 @@ msgid "Allow non-logged-in users to run programs"
 msgstr "Να επιτρέπεται σε μη συνδεμένους χρήστες να εκτελούν προγράμματα"
 
 #: ../src/login/org.freedesktop.login1.policy.in.h:20
-msgid ""
-"Authentication is required to run programs as a non-logged-in user."
+msgid "Authentication is required to run programs as a non-logged-in user."
 msgstr ""
 "Απαιτείται πιστοποίηση για να επιτρέπεται σε μη συνδεμένους χρήστες να "
 "εκτελούν προγράμματα."
@@ -342,6 +420,67 @@ msgstr ""
 "Απαιτείται πιστοποίηση για αδρανοποίηση του συστήματος ενώ μια εφαρμογή "
 "ζήτησε να αποτραπεί."
 
+#: ../src/login/org.freedesktop.login1.policy.in.h:49
+msgid "Manage active sessions, users and seats"
+msgstr ""
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:50
+#, fuzzy
+msgid ""
+"Authentication is required for managing active sessions, users and seats."
+msgstr ""
+"Απαιτείται πιστοποίηση για προσάρτηση μιας συσκευής σε έναν σταθμό εργασίας."
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:51
+msgid "Lock or unlock active sessions"
+msgstr ""
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:52
+#, fuzzy
+msgid "Authentication is required to lock or unlock active sessions."
+msgstr "Απαιτείται πιστοποίηση για να ορίσετε πληροφορίες τοπικής μηχανής."
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:53
+msgid "Allow indication to the firmware to boot to setup interface"
+msgstr ""
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:54
+#, fuzzy
+msgid ""
+"Authentication is required to indicate to the firmware to boot to setup "
+"interface."
+msgstr "Απαιτείται πιστοποίηση για να ορίσετε τοπικά όνομα οικοδεσπότη."
+
+#: ../src/machine/org.freedesktop.machine1.policy.in.h:1
+msgid "Log into a local container"
+msgstr ""
+
+#: ../src/machine/org.freedesktop.machine1.policy.in.h:2
+#, fuzzy
+msgid "Authentication is required to log into a local container."
+msgstr "Απαιτείται πιστοποίηση για να ορίσετε τοπικά όνομα οικοδεσπότη."
+
+#: ../src/machine/org.freedesktop.machine1.policy.in.h:3
+msgid "Manage local virtual machines and containers"
+msgstr ""
+
+#: ../src/machine/org.freedesktop.machine1.policy.in.h:4
+#, fuzzy
+msgid ""
+"Authentication is required to manage local virtual machines and containers."
+msgstr "Απαιτείται πιστοποίηση για να ορίσετε πληροφορίες τοπικής μηχανής."
+
+#: ../src/machine/org.freedesktop.machine1.policy.in.h:5
+msgid "Manage local virtual machine and container images"
+msgstr ""
+
+#: ../src/machine/org.freedesktop.machine1.policy.in.h:6
+#, fuzzy
+msgid ""
+"Authentication is required to manage local virtual machine and container "
+"images."
+msgstr "Απαιτείται πιστοποίηση για να ορίσετε πληροφορίες τοπικής μηχανής."
+
 #: ../src/timedate/org.freedesktop.timedate1.policy.in.h:1
 msgid "Set system time"
 msgstr "Ορισμός ώρας συστήματος"
@@ -381,35 +520,3 @@ msgid ""
 msgstr ""
 "Απαιτείται πιστοποίηση για να ελέγξετε αν ο συγχρονισμός ώρας δικτύου θα "
 "ενεργοποιηθεί."
-
-#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:1
-msgid "Send passphrase back to system"
-msgstr "Αποστολή του συνθηματικού πίσω στο σύστημα"
-
-#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:2
-msgid ""
-"Authentication is required to send the entered passphrase back to the system."
-msgstr ""
-"Απαιτείται πιστοποίηση για αποστολή του εισερχόμενου συνθηματικού πίσω στο "
-"σύστημα."
-
-#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:3
-msgid "Privileged system and service manager access"
-msgstr "Προνομιούχος πρόσβαση διαχειριστή συστήματος και υπηρεσίας"
-
-#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:4
-msgid "Authentication is required to access the system and service manager."
-msgstr ""
-"Απαιτείται πιστοποίηση για να προσπελάσετε τον διαχειριστή συστήματος και "
-"υπηρεσιών."
-
-#: ../src/fsckd/fsckd.c:186
-msgid "Press Ctrl+C to cancel all filesystem checks in progress"
-msgstr ""
-
-#: ../src/fsckd/fsckd.c:227
-#, c-format
-msgid "Checking in progress on %d disk (%3.1f%% complete)"
-msgid_plural "Checking in progress on %d disks (%3.1f%% complete)"
-msgstr[0] ""
-msgstr[1] ""
diff --git a/po/es.po b/po/es.po
index 82acbc3..ceca423 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: systemd master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-10 23:25+0200\n"
+"POT-Creation-Date: 2015-06-18 00:53+0200\n"
 "PO-Revision-Date: 2015-04-24 13:26+0200\n"
 "Last-Translator: Álex Puchades <alex94puchades at gmail.com>\n"
 "Language-Team: Español; Castellano <gnome-es-list at gnome.org>\n"
diff --git a/po/fr.po b/po/fr.po
index e8592e6..8b9f16d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: systemd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-10 23:25+0200\n"
+"POT-Creation-Date: 2015-06-18 00:53+0200\n"
 "PO-Revision-Date: 2014-12-28 13:04+0100\n"
 "Last-Translator: Sylvain Plantefève <sylvain.plantefeve at gmail.com>\n"
 "Language-Team: French\n"
diff --git a/po/hu.po b/po/hu.po
index 0e15db5..c5dee25 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: systemd master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-10 23:25+0200\n"
+"POT-Creation-Date: 2015-06-18 00:53+0200\n"
 "PO-Revision-Date: 2015-01-02 22:58+0100\n"
 "Last-Translator: Gabor Kelemen <kelemeng at ubuntu dot com>\n"
 "Language-Team: Hungarian <openscope at googlegroups dot com>\n"
diff --git a/po/it.po b/po/it.po
index a9d6363..e11e7e3 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: systemd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-10 23:04+0200\n"
+"POT-Creation-Date: 2015-06-18 00:53+0200\n"
 "PO-Revision-Date: 2015-06-10 23:10+0100\n"
 "Last-Translator: Daniele Medri <dmedri at gmail.com>\n"
 "Language-Team: Italian\n"
diff --git a/po/pl.po b/po/pl.po
index 96887f0..ff8053f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: systemd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-10 23:25+0200\n"
+"POT-Creation-Date: 2015-06-18 00:53+0200\n"
 "PO-Revision-Date: 2015-04-12 01:44+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag at gmail.com>\n"
 "Language-Team: Polish <trans-pl at lists.fedoraproject.org>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 619a91a..1dd5900 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: systemd master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-10 23:25+0200\n"
+"POT-Creation-Date: 2015-06-18 00:53+0200\n"
 "PO-Revision-Date: 2015-01-10 12:23-0300\n"
 "Last-Translator: Rafael Ferreira <rafael.f.f1 at gmail.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list at gnome.org>\n"
diff --git a/po/ru.po b/po/ru.po
index e7426c6..efb6f7b 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: systemd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-10 23:25+0200\n"
+"POT-Creation-Date: 2015-06-18 00:53+0200\n"
 "PO-Revision-Date: 2015-03-22 21:53+0300\n"
 "Last-Translator: Sergey Ptashnick <0comffdiz at inbox.ru>\n"
 "Language: ru\n"
diff --git a/po/sv.po b/po/sv.po
index c290446..af8f421 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: systemd master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-10 23:25+0200\n"
+"POT-Creation-Date: 2015-06-18 00:53+0200\n"
 "PO-Revision-Date: 2015-03-14 11:09+0100\n"
 "Last-Translator: Sebastian Rasmussen <sebras at gmail.com>\n"
 "Language-Team: Swedish\n"
diff --git a/po/uk.po b/po/uk.po
index 1a83af7..656d59c 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: systemd master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-10 23:25+0200\n"
+"POT-Creation-Date: 2015-06-18 00:53+0200\n"
 "PO-Revision-Date: 2014-07-16 19:13+0300\n"
 "Last-Translator: Daniel Korostil <ted.korostiled at gmail.com>\n"
 "Language-Team: linux.org.ua\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 77be569..fb276a1 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: https://github.com/systemd/systemd/issues\n"
-"POT-Creation-Date: 2015-06-10 11:41+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-06-18 00:53+0200\n"
 "PO-Revision-Date: 2015-06-11 12:44+0800\n"
 "Last-Translator: Jeff Huang <s8321414 at gmail.com>\n"
 "Language-Team: chinese-l10n <chinese-l10n at googlegroups.com>\n"
@@ -50,9 +50,7 @@ msgstr "設定或取消設定系統及服務管理員環境變量"
 msgid ""
 "Authentication is required to set or unset system and service manager "
 "environment variables."
-msgstr ""
-"設定或取消設定系統及服務管理員環境變量時"
-"需要驗證"
+msgstr "設定或取消設定系統及服務管理員環境變量時需要驗證"
 
 #: ../src/core/org.freedesktop.systemd1.policy.in.in.h:9
 msgid "Reload the systemd state"
@@ -78,9 +76,7 @@ msgstr "設定靜態主機名稱"
 msgid ""
 "Authentication is required to set the statically configured local host name, "
 "as well as the pretty host name."
-msgstr ""
-"設定靜態設定的本機主機名稱時需要驗證，"
-"同時也需要漂亮的主機名稱"
+msgstr "設定靜態設定的本機主機名稱時需要驗證，同時也需要漂亮的主機名稱"
 
 #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:5
 msgid "Set machine information"
@@ -171,9 +167,7 @@ msgstr "允許應用程式阻止自動系統暫停"
 msgid ""
 "Authentication is required for an application to inhibit automatic system "
 "suspend."
-msgstr ""
-"要讓應用程式阻止自動系統暫停"
-"需要驗證。"
+msgstr "要讓應用程式阻止自動系統暫停需要驗證。"
 
 #: ../src/login/org.freedesktop.login1.policy.in.h:11
 msgid "Allow applications to inhibit system handling of the power key"
@@ -183,9 +177,7 @@ msgstr "允許應用程式阻止系統處理電源鍵"
 msgid ""
 "Authentication is required for an application to inhibit system handling of "
 "the power key."
-msgstr ""
-"要讓應用程式阻止系統處理電源鍵"
-"需要驗證。"
+msgstr "要讓應用程式阻止系統處理電源鍵需要驗證。"
 
 #: ../src/login/org.freedesktop.login1.policy.in.h:13
 msgid "Allow applications to inhibit system handling of the suspend key"
@@ -195,9 +187,7 @@ msgstr "允許應用程式阻止系統處理暫停鍵"
 msgid ""
 "Authentication is required for an application to inhibit system handling of "
 "the suspend key."
-msgstr ""
-"要讓應用程式阻止系統處理暫停鍵"
-"需要驗證。"
+msgstr "要讓應用程式阻止系統處理暫停鍵需要驗證。"
 
 #: ../src/login/org.freedesktop.login1.policy.in.h:15
 msgid "Allow applications to inhibit system handling of the hibernate key"
@@ -207,9 +197,7 @@ msgstr "允許應用程式阻止系統處理冬眠鍵"
 msgid ""
 "Authentication is required for an application to inhibit system handling of "
 "the hibernate key."
-msgstr ""
-"要讓應用程式阻止系統處理冬眠鍵"
-"需要驗證。"
+msgstr "要讓應用程式阻止系統處理冬眠鍵需要驗證。"
 
 #: ../src/login/org.freedesktop.login1.policy.in.h:17
 msgid "Allow applications to inhibit system handling of the lid switch"
@@ -219,9 +207,7 @@ msgstr "允許應用程式阻止系統處理上蓋開關"
 msgid ""
 "Authentication is required for an application to inhibit system handling of "
 "the lid switch."
-msgstr ""
-"要讓應用程式阻止系統處理上蓋開關"
-"需要驗證。"
+msgstr "要讓應用程式阻止系統處理上蓋開關需要驗證。"
 
 #: ../src/login/org.freedesktop.login1.policy.in.h:19
 msgid "Allow non-logged-in users to run programs"
@@ -264,9 +250,7 @@ msgstr "在有其他使用者登入時關閉系統電源"
 msgid ""
 "Authentication is required for powering off the system while other users are "
 "logged in."
-msgstr ""
-"在有其他使用者登入時關閉系統電源"
-"需要驗證。"
+msgstr "在有其他使用者登入時關閉系統電源需要驗證。"
 
 #: ../src/login/org.freedesktop.login1.policy.in.h:29
 msgid "Power off the system while an application asked to inhibit it"
@@ -276,9 +260,7 @@ msgstr "當應用程式阻止系統電源關閉時將其關閉"
 msgid ""
 "Authentication is required for powering off the system while an application "
 "asked to inhibit it."
-msgstr ""
-"當應用程式阻止系統電源關閉時將系統電源關閉"
-"需要驗證。"
+msgstr "當應用程式阻止系統電源關閉時將系統電源關閉需要驗證。"
 
 #: ../src/login/org.freedesktop.login1.policy.in.h:31
 msgid "Reboot the system"
@@ -296,9 +278,7 @@ msgstr "在有其他使用者登入時重新啟動系統"
 msgid ""
 "Authentication is required for rebooting the system while other users are "
 "logged in."
-msgstr ""
-"在有其他使用者登入時重新啟動系統"
-"需要驗證。"
+msgstr "在有其他使用者登入時重新啟動系統需要驗證。"
 
 #: ../src/login/org.freedesktop.login1.policy.in.h:35
 msgid "Reboot the system while an application asked to inhibit it"
@@ -308,9 +288,7 @@ msgstr "當應用程式阻止重新啟動系統時將系統重新啟動"
 msgid ""
 "Authentication is required for rebooting the system while an application "
 "asked to inhibit it."
-msgstr ""
-"當應用程式阻止系統重新啟動時將系統重新啟動"
-"需要驗證。"
+msgstr "當應用程式阻止系統重新啟動時將系統重新啟動需要驗證。"
 
 #: ../src/login/org.freedesktop.login1.policy.in.h:37
 msgid "Suspend the system"
@@ -328,9 +306,7 @@ msgstr "在有其他使用者登入時暫停系統"
 msgid ""
 "Authentication is required for suspending the system while other users are "
 "logged in."
-msgstr ""
-"在有其他使用者登入時暫停系統"
-"需要驗證。"
+msgstr "在有其他使用者登入時暫停系統需要驗證。"
 
 #: ../src/login/org.freedesktop.login1.policy.in.h:41
 msgid "Suspend the system while an application asked to inhibit it"
@@ -340,9 +316,7 @@ msgstr "當應用程式阻止暫停系統時將系統暫停"
 msgid ""
 "Authentication is required for suspending the system while an application "
 "asked to inhibit it."
-msgstr ""
-"當應用程式阻止系統暫停時將系統暫停"
-"需要驗證。"
+msgstr "當應用程式阻止系統暫停時將系統暫停需要驗證。"
 
 #: ../src/login/org.freedesktop.login1.policy.in.h:43
 msgid "Hibernate the system"
@@ -360,9 +334,7 @@ msgstr "在有其他使用者登入時冬眠系統"
 msgid ""
 "Authentication is required for hibernating the system while other users are "
 "logged in."
-msgstr ""
-"在有其他使用者登入時冬眠系統"
-"需要驗證。"
+msgstr "在有其他使用者登入時冬眠系統需要驗證。"
 
 #: ../src/login/org.freedesktop.login1.policy.in.h:47
 msgid "Hibernate the system while an application asked to inhibit it"
@@ -372,9 +344,7 @@ msgstr "當應用程式阻止冬眠系統時將系統冬眠"
 msgid ""
 "Authentication is required for hibernating the system while an application "
 "asked to inhibit it."
-msgstr ""
-"當應用程式阻止系統冬眠時將系統冬眠"
-"需要驗證。"
+msgstr "當應用程式阻止系統冬眠時將系統冬眠需要驗證。"
 
 #: ../src/login/org.freedesktop.login1.policy.in.h:49
 msgid "Manage active sessions, users and seats"
@@ -401,9 +371,7 @@ msgstr "允許對韌體的指示以開始設定介面"
 msgid ""
 "Authentication is required to indicate to the firmware to boot to setup "
 "interface."
-msgstr ""
-"對韌體的指示以開始設定介面"
-"需要驗證。"
+msgstr "對韌體的指示以開始設定介面需要驗證。"
 
 #: ../src/machine/org.freedesktop.machine1.policy.in.h:1
 msgid "Log into a local container"
@@ -430,9 +398,7 @@ msgstr "管理本機虛擬機器及容器映像"
 msgid ""
 "Authentication is required to manage local virtual machine and container "
 "images."
-msgstr ""
-"管理本機虛擬機器及容器映像"
-"需要驗證。"
+msgstr "管理本機虛擬機器及容器映像需要驗證。"
 
 #: ../src/timedate/org.freedesktop.timedate1.policy.in.h:1
 msgid "Set system time"
@@ -458,9 +424,7 @@ msgstr "將 RTC 設定為本地時區或 UTC"
 msgid ""
 "Authentication is required to control whether the RTC stores the local or "
 "UTC time."
-msgstr ""
-"控制 RTC 儲存本地或 UTC 時間"
-"需要驗證。"
+msgstr "控制 RTC 儲存本地或 UTC 時間需要驗證。"
 
 #: ../src/timedate/org.freedesktop.timedate1.policy.in.h:7
 msgid "Turn network time synchronization on or off"
@@ -470,8 +434,4 @@ msgstr "打開或關閉網路時間同步"
 msgid ""
 "Authentication is required to control whether network time synchronization "
 "shall be enabled."
-msgstr ""
-"控制網路時間同步是否啟用"
-"需要驗證。"
-
-
+msgstr "控制網路時間同步是否啟用需要驗證。"

commit a38d92691fdf71599476b39006703aef519a2a0e
Merge: cf4d75c 06528e8
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Jun 19 12:47:21 2015 +0200

    Merge pull request #298 from zonque/intltool
    
    build-sys: bring back an intltool-update workaround


commit 06528e8fdd82b243af41b8842d71169632c4a658
Author: Daniel Mack <daniel at zonque.org>
Date:   Fri Jun 19 10:22:06 2015 +0200

    build-sys: bring back an intltool-update workaround
    
    Currently, 'make distcheck' fails with an error such as this:
    
        srcdir=../../po /usr/bin/intltool-update -m
        The following files contain translations and are currently not in use.
        Please consider adding these to the POTFILES.in file, located in the po/ directory.
    
        build2/src/core/org.freedesktop.systemd1.policy.in
        build3/src/core/org.freedesktop.systemd1.policy.in
    
        [...]
    
    This is caused by a new behavior of autmake 1.15 which changed the
    location of the build tree during 'make distcheck', and the fact that
    intltool doesn't yet ignore that paths.
    
    We used to have a workaround in configure.ac that makes the failing call
    a no-op, but it was accidentially removed in 23756070
    ("remove gudev and gtk-doc").
    
    Bring back that snipet for now, until intltool and automake sorted out
    their issues and like each other again.
    
    Also see
    
      https://bugs.launchpad.net/intltool/+bug/1117944

diff --git a/configure.ac b/configure.ac
index 0784966..8b1e275 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1430,6 +1430,11 @@ AS_IF([test "x${enable_split_usr}" = "xyes"], [
 ])
 AM_CONDITIONAL(ENABLE_SPLIT_USR, [test "x${enable_split_usr}" = "xyes"])
 
+# work around intltool-update issues during 'make distcheck'
+AS_IF([test "x$0" != "x./configure"], [
+        AC_SUBST([INTLTOOL_UPDATE], [/bin/true])
+])
+
 # QEMU and OVMF UEFI firmware
 AS_IF([test x"$cross_compiling" = "xyes"], [], [
         AC_PATH_PROG([QEMU], [qemu-system-x86_64])

commit cf4d75ccf972a08f7a79950b7a9c7576288bf59e
Merge: a2088fd 0a07970
Author: Ronny Chevalier <chevalier.ronny at gmail.com>
Date:   Fri Jun 19 10:24:13 2015 +0200

    Merge pull request #297 from ssahani/net
    
    networkd: vlan improve logging


commit 0a07970ead3982dddffec7fed090eb05ceb39e1b
Author: Susant Sahani <susant at redhat.com>
Date:   Mon Jun 15 09:04:28 2015 +0530

    networkd: vlan improve logging
    
    Replaces strerror() usage with log_netdev_error_errno()

diff --git a/src/network/networkd-netdev-vlan.c b/src/network/networkd-netdev-vlan.c
index d53e7be..195d1a9 100644
--- a/src/network/networkd-netdev-vlan.c
+++ b/src/network/networkd-netdev-vlan.c
@@ -34,12 +34,8 @@ static int netdev_vlan_fill_message_create(NetDev *netdev, Link *link, sd_netlin
 
         if (v->id <= VLANID_MAX) {
                 r = sd_netlink_message_append_u16(req, IFLA_VLAN_ID, v->id);
-                if (r < 0) {
-                        log_netdev_error(netdev,
-                                         "Could not append IFLA_VLAN_ID attribute: %s",
-                                         strerror(-r));
-                        return r;
-                }
+                if (r < 0)
+                        return log_netdev_error_errno(netdev, r, "Could not append IFLA_VLAN_ID attribute: %m");
         }
 
         return 0;

commit a2088fd025deb90839c909829e27eece40f7fce4
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Jun 19 01:12:54 2015 +0200

    update TODO

diff --git a/TODO b/TODO
index d629474..386599b 100644
--- a/TODO
+++ b/TODO
@@ -17,8 +17,6 @@ Bugfixes:
 
 External:
 
-* "systemctl edit" should know a mode to create a new unit file
-
 * Fedora: add an rpmlint check that verifies that all unit files in the RPM are listed in %systemd_post macros.
 
 * wiki: update journal format documentation for lz4 additions
@@ -28,6 +26,13 @@ External:
 
 Features:
 
+* "systemctl edit" should know a mode to create a new unit file
+
+* there's probably something wrong with having user mounts below /sys,
+  as we have for debugfs. for exmaple, src/core/mount.c handles mounts
+  prefixed with /sys generally special.
+  http://lists.freedesktop.org/archives/systemd-devel/2015-June/032962.html
+
 * Add PassEnvironment= setting to service units, to import select env vars from PID 1 into the service env block
 
 * nspawn: fix logic always print a final newline on output.

commit b912e251812bb65bed1d545d9748f5b0918f1559
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Jun 19 01:12:28 2015 +0200

    NEWS: update contributors list and date

diff --git a/NEWS b/NEWS
index 0532cef..bda8a8e 100644
--- a/NEWS
+++ b/NEWS
@@ -70,13 +70,13 @@ CHANGES WITH 221:
         Poettering, Marc-Antoine Perennou, Marcel Holtmann, Mario
         Limonciello, Martin Pitt, Michael Biebl, Michael Olbrich,
         Michal Schmidt, Mike Gilbert, Nick Owens, Pablo Lezaeta Reyes,
-        Patrick Donnelly, Peter Hutterer, Philip Withnall, Ronny
-        Chevalier, Simon McVittie, Susant Sahani, Thomas Hindoe
-        Paaboel Andersen, Tom Gundersen, Torstein Husebø, Umut
-        Tezduyar Lindskog, Viktar Vauchkevich, Werner Fink, Zbigniew
-        Jędrzejewski-Szmek
+        Patrick Donnelly, Pavel Odvody, Peter Hutterer, Philip
+        Withnall, Ronny Chevalier, Simon McVittie, Susant Sahani,
+        Thomas Hindoe Paaboel Andersen, Tom Gundersen, Torstein
+        Husebø, Umut Tezduyar Lindskog, Viktar Vauchkevich, Werner
+        Fink, Zbigniew Jędrzejewski-Szmek
 
-        -- Berlin, 2015-06-XX
+        -- Berlin, 2015-06-19
 
 CHANGES WITH 220:
 

commit 6433d440729d22f5954ea1bf9c828bbad04e0838
Merge: 38489ef 12b42c7
Author: Kay Sievers <kay at vrfy.org>
Date:   Thu Jun 18 22:27:50 2015 +0200

    Merge pull request #293 from teg/man-revert
    
    man: revert dynamic paths for split-usr setups


commit 38489ef8b2998e2015de629d80932ffcb6a2e78c
Merge: 7324b6e 4f1b306
Author: David Herrmann <dh.herrmann at googlemail.com>
Date:   Thu Jun 18 22:05:09 2015 +0200

    Merge pull request #294 from teg/hashmap-debug-locking-2
    
    hashmap: debug - lock access to the global hashmap list


commit 7324b6e4ef7a52be07b9e6c40eafca0560b3561a
Merge: ea0707c 2ef24a1
Author: David Herrmann <dh.herrmann at googlemail.com>
Date:   Thu Jun 18 21:42:08 2015 +0200

    Merge pull request #292 from teg/man-udev-2
    
    man: udev_device - finish new_* man page


commit ea0707c6613edd057ee33667416b43cc89a7d863
Merge: c874ef0 68a313c
Author: David Herrmann <dh.herrmann at googlemail.com>
Date:   Thu Jun 18 21:38:09 2015 +0200

    Merge pull request #291 from poettering/nspawn-suppress-eloop
    
    nspawn: suppress warning when /etc/resolv.conf is a valid symlink


commit 4f1b306169c2651f20a20befd18926677a272d8f
Author: Tom Gundersen <teg at jklm.no>
Date:   Thu Jun 18 11:31:10 2015 +0200

    hashmap: debug - lock access to the global hashmap list
    
    This may be used from multi-threaded programs (say through nss-resolve),
    so we must protect the global list.
    
    This is still only relevant for debug builds, so we do not try to handle
    cases where the locking fail, but simply assert.

diff --git a/src/basic/hashmap.c b/src/basic/hashmap.c
index 0ee2f3b..a84fc5b 100644
--- a/src/basic/hashmap.c
+++ b/src/basic/hashmap.c
@@ -22,6 +22,7 @@
 
 #include <stdlib.h>
 #include <errno.h>
+#include <pthread.h>
 
 #include "util.h"
 #include "hashmap.h"
@@ -157,6 +158,7 @@ struct hashmap_debug_info {
 
 /* Tracks all existing hashmaps. Get at it from gdb. See sd_dump_hashmaps.py */
 static LIST_HEAD(struct hashmap_debug_info, hashmap_debug_list);
+static pthread_mutex_t hashmap_debug_list_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 #define HASHMAP_DEBUG_FIELDS struct hashmap_debug_info debug;
 
@@ -806,10 +808,12 @@ static struct HashmapBase *hashmap_base_new(const struct hash_ops *hash_ops, enu
         }
 
 #ifdef ENABLE_DEBUG_HASHMAP
-        LIST_PREPEND(debug_list, hashmap_debug_list, &h->debug);
         h->debug.func = func;
         h->debug.file = file;
         h->debug.line = line;
+        assert_se(pthread_mutex_lock(&hashmap_debug_list_mutex) == 0);
+        LIST_PREPEND(debug_list, hashmap_debug_list, &h->debug);
+        assert_se(pthread_mutex_unlock(&hashmap_debug_list_mutex) == 0);
 #endif
 
         return h;
@@ -861,7 +865,9 @@ static void hashmap_free_no_clear(HashmapBase *h) {
         assert(!h->n_direct_entries);
 
 #ifdef ENABLE_DEBUG_HASHMAP
+        assert_se(pthread_mutex_lock(&hashmap_debug_list_mutex) == 0);
         LIST_REMOVE(debug_list, hashmap_debug_list, &h->debug);
+        assert_se(pthread_mutex_unlock(&hashmap_debug_list_mutex) == 0);
 #endif
 
         if (h->from_pool)

commit c874ef05a705d3c679e5fd5a50b81e1f5512c4fd
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Jun 18 20:08:01 2015 +0200

    update TODO

diff --git a/TODO b/TODO
index f0e95fc..d629474 100644
--- a/TODO
+++ b/TODO
@@ -28,6 +28,8 @@ External:
 
 Features:
 
+* Add PassEnvironment= setting to service units, to import select env vars from PID 1 into the service env block
+
 * nspawn: fix logic always print a final newline on output.
   https://github.com/systemd/systemd/pull/272#issuecomment-113153176
 

commit affb71da79b0c3cbcd6ff6c0cedb218a14162c7c
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Jun 18 20:03:11 2015 +0200

    update TODO

diff --git a/TODO b/TODO
index 80e6ab5..f0e95fc 100644
--- a/TODO
+++ b/TODO
@@ -28,6 +28,9 @@ External:
 
 Features:
 
+* nspawn: fix logic always print a final newline on output.
+  https://github.com/systemd/systemd/pull/272#issuecomment-113153176
+
 * make nspawn's --network-veth switch more powerful:
   http://lists.freedesktop.org/archives/systemd-devel/2015-June/033121.html
 

commit 12b42c76672a66c2d4ea7212c14f8f1b5a62b78d
Author: Tom Gundersen <teg at jklm.no>
Date:   Thu Jun 18 19:47:44 2015 +0200

    man: revert dynamic paths for split-usr setups
    
    This did not really work out as we had hoped. Trying to do this upstream
    introduced several problems that probably makes it better suited as a
    downstream patch after all. At any rate, it is not releaseable in the
    current state, so we at least need to revert this before the release.
    
     * by adjusting the path to binaries, but not do the same thing to the
       search path we end up with inconsistent man-pages. Adjusting the search
       path too would be quite messy, and it is not at all obvious that this is
       worth the effort, but at any rate it would have to be done before we
       could ship this.
    
     * this means that distributed man-pages does not make sense as they depend
       on config options, and for better or worse we are still distributing
       man pages, so that is something that definitely needs sorting out before
       we could ship with this patch.
    
     * we have long held that split-usr is only minimally supported in order
       to boot, and something we hope will eventually go away. So before we start
       adding even more magic/effort in order to make this work nicely, we should
       probably question if it makes sense at all.

diff --git a/man/binfmt.d.xml b/man/binfmt.d.xml
index 3aa5eb1..5b63cfb 100644
--- a/man/binfmt.d.xml
+++ b/man/binfmt.d.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
diff --git a/man/bootchart.conf.xml b/man/bootchart.conf.xml
index b383f6e..bf6ca0b 100644
--- a/man/bootchart.conf.xml
+++ b/man/bootchart.conf.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
@@ -55,17 +52,17 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>&pkgsysconfdir;/bootchart.conf</filename></para>
-    <para><filename>&pkgsysconfdir;/bootchart.conf.d/*.conf</filename></para>
+    <para><filename>/etc/systemd/bootchart.conf</filename></para>
+    <para><filename>/etc/systemd/bootchart.conf.d/*.conf</filename></para>
     <para><filename>/run/systemd/bootchart.conf.d/*.conf</filename></para>
-    <para><filename>&rootlibexecdir;/bootchart.conf.d/*.conf</filename></para>
+    <para><filename>/usr/lib/systemd/bootchart.conf.d/*.conf</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
     <title>Description</title>
 
     <para>When starting, systemd-bootchart will read the configuration
-    file <filename>&pkgsysconfdir;/bootchart.conf</filename>, followed by
+    file <filename>/etc/systemd/bootchart.conf</filename>, followed by
     the files in the <filename>bootchart.conf.d</filename>
     directories. These configuration files determine logging
     parameters and graph output.</para>
@@ -125,10 +122,10 @@
         <term><varname>Init=[path]</varname></term>
         <listitem><para>Configures bootchart to run a non-standard
         binary instead of
-        <filename>&rootlibexecdir;/systemd</filename>. This option is
+        <filename>/usr/lib/systemd/systemd</filename>. This option is
         only relevant if bootchart was invoked from the kernel command
         line with
-        init=&rootlibexecdir;/systemd-bootchart.</para></listitem>
+        init=/usr/lib/systemd/systemd-bootchart.</para></listitem>
       </varlistentry>
 
       <varlistentry>
diff --git a/man/bootctl.xml b/man/bootctl.xml
index c7c65aa..63ad939 100644
--- a/man/bootctl.xml
+++ b/man/bootctl.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/bootup.xml b/man/bootup.xml
index de34a59..b92057a 100644
--- a/man/bootup.xml
+++ b/man/bootup.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/busctl.xml b/man/busctl.xml
index 08303b4..807fc78 100644
--- a/man/busctl.xml
+++ b/man/busctl.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/coredump.conf.xml b/man/coredump.conf.xml
index 4c65c1c..fd54c59 100644
--- a/man/coredump.conf.xml
+++ b/man/coredump.conf.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
@@ -52,10 +49,10 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>&pkgsysconfdir;/coredump.conf</filename></para>
-    <para><filename>&pkgsysconfdir;/coredump.conf.d/*.conf</filename></para>
+    <para><filename>/etc/systemd/coredump.conf</filename></para>
+    <para><filename>/etc/systemd/coredump.conf.d/*.conf</filename></para>
     <para><filename>/run/systemd/coredump.conf.d/*.conf</filename></para>
-    <para><filename>&rootlibexecdir;/coredump.conf.d/*.conf</filename></para>
+    <para><filename>/usr/lib/systemd/coredump.conf.d/*.conf</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
diff --git a/man/coredumpctl.xml b/man/coredumpctl.xml
index 4bd1a7e..efbc655 100644
--- a/man/coredumpctl.xml
+++ b/man/coredumpctl.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/crypttab.xml b/man/crypttab.xml
index d403e71..d4ff760 100644
--- a/man/crypttab.xml
+++ b/man/crypttab.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
diff --git a/man/daemon.xml b/man/daemon.xml
index 38d458e..a8bbfc0 100644
--- a/man/daemon.xml
+++ b/man/daemon.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/file-hierarchy.xml b/man/file-hierarchy.xml
index f73a3ed..3a5627d 100644
--- a/man/file-hierarchy.xml
+++ b/man/file-hierarchy.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/halt.xml b/man/halt.xml
index f425ebd..a06dbd0 100644
--- a/man/halt.xml
+++ b/man/halt.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/hostname.xml b/man/hostname.xml
index 34aaca1..9688450 100644
--- a/man/hostname.xml
+++ b/man/hostname.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/hostnamectl.xml b/man/hostnamectl.xml
index 9393466..b1f0381 100644
--- a/man/hostnamectl.xml
+++ b/man/hostnamectl.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/hwdb.xml b/man/hwdb.xml
index 8a6e26d..80939dd 100644
--- a/man/hwdb.xml
+++ b/man/hwdb.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <refentry id="hwdb" conditional="ENABLE_HWDB">
   <refentryinfo>
@@ -43,15 +40,16 @@
 
   <refsect1><title>Hardware Database Files</title>
       <para>The hwdb files are read from the files located in the
-      system hwdb directory <filename>&udevlibexecdir;/hwdb.d</filename>
-      and the local administration directory <filename>/etc/udev/hwdb.d</filename>.
+      system hwdb directory <filename>/usr/lib/udev/hwdb.d</filename> and
+      the local administration directory <filename>/etc/udev/hwdb.d</filename>.
       All hwdb files are collectively sorted and processed in lexical order,
       regardless of the directories in which they live. However, files with
       identical filenames replace each other. Files in <filename>/etc</filename>
-      take precedence over files with the same name in <filename>&rootprefix;/lib</filename>.
-      This can be used to override a system-supplied hwdb file with a local file if needed;
+      have the highest priority and take precedence over files with the same
+      name in <filename>/usr/lib</filename>. This can be used to override a
+      system-supplied hwdb file with a local file if needed;
       a symlink in <filename>/etc</filename> with the same name as a hwdb file in
-      <filename>&rootprefix;/lib</filename>, pointing to <filename>/dev/null</filename>,
+      <filename>/usr/lib</filename>, pointing to <filename>/dev/null</filename>,
       disables the hwdb file entirely. hwdb files must have the extension
       <filename>.hwdb</filename>; other extensions are ignored.</para>
 
@@ -71,7 +69,7 @@
       <para>The content of all hwdb files is read by
       <citerefentry><refentrytitle>systemd-hwdb</refentrytitle><manvolnum>8</manvolnum></citerefentry>
       and compiled to a binary database located at <filename>/etc/udev/hwdb.bin</filename>,
-      or alternatively <filename>&udevlibexecdir;/hwdb.bin</filename> if you want ship the compiled
+      or alternatively <filename>/usr/lib/udev/hwdb.bin</filename> if you want ship the compiled
       database in an immutable image.
       During runtime only the binary database is used.</para>
   </refsect1>
diff --git a/man/journal-remote.conf.xml b/man/journal-remote.conf.xml
index 948dfa5..fc60258 100644
--- a/man/journal-remote.conf.xml
+++ b/man/journal-remote.conf.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
@@ -52,10 +49,10 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>&pkgsysconfdir;/journal-remote.conf</filename></para>
-    <para><filename>&pkgsysconfdir;/journald.conf.d/*.conf</filename></para>
+    <para><filename>/etc/systemd/journal-remote.conf</filename></para>
+    <para><filename>/etc/systemd/journald.conf.d/*.conf</filename></para>
     <para><filename>/run/systemd/journald.conf.d/*.conf</filename></para>
-    <para><filename>&rootlibexecdir;/journald.conf.d/*.conf</filename></para>
+    <para><filename>/usr/lib/systemd/journald.conf.d/*.conf</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
diff --git a/man/journalctl.xml b/man/journalctl.xml
index d67d960..08de0ff 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/journald.conf.xml b/man/journald.conf.xml
index f8eb398..d6fe45d 100644
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
@@ -52,10 +49,10 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>&pkgsysconfdir;/journald.conf</filename></para>
-    <para><filename>&pkgsysconfdir;/journald.conf.d/*.conf</filename></para>
+    <para><filename>/etc/systemd/journald.conf</filename></para>
+    <para><filename>/etc/systemd/journald.conf.d/*.conf</filename></para>
     <para><filename>/run/systemd/journald.conf.d/*.conf</filename></para>
-    <para><filename>&rootlibexecdir;/journald.conf.d/*.conf</filename></para>
+    <para><filename>/usr/lib/systemd/journald.conf.d/*.conf</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml
index 6490123..eb73727 100644
--- a/man/kernel-command-line.xml
+++ b/man/kernel-command-line.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/kernel-install.xml b/man/kernel-install.xml
index 8891bae..d7e27de 100644
--- a/man/kernel-install.xml
+++ b/man/kernel-install.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/less-variables.xml b/man/less-variables.xml
index e344c62..0fb4d7f 100644
--- a/man/less-variables.xml
+++ b/man/less-variables.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-                 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+                 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 
 <refsect1>
         <title>Environment</title>
diff --git a/man/libsystemd-pkgconfig.xml b/man/libsystemd-pkgconfig.xml
index 3620f47..272da64 100644
--- a/man/libsystemd-pkgconfig.xml
+++ b/man/libsystemd-pkgconfig.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-          "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+          "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 
 <refsect1>
   <title>Notes</title>
diff --git a/man/locale.conf.xml b/man/locale.conf.xml
index 8af49af..2c32d16 100644
--- a/man/locale.conf.xml
+++ b/man/locale.conf.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/localectl.xml b/man/localectl.xml
index caf963a..7def047 100644
--- a/man/localectl.xml
+++ b/man/localectl.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/localtime.xml b/man/localtime.xml
index 1740dde..2827da6 100644
--- a/man/localtime.xml
+++ b/man/localtime.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/loginctl.xml b/man/loginctl.xml
index d0529c1..9dda14d 100644
--- a/man/loginctl.xml
+++ b/man/loginctl.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/logind.conf.xml b/man/logind.conf.xml
index 96ebd6e..2b79547 100644
--- a/man/logind.conf.xml
+++ b/man/logind.conf.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
@@ -52,10 +49,10 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>&pkgsysconfdir;/logind.conf</filename></para>
-    <para><filename>&pkgsysconfdir;/logind.conf.d/*.conf</filename></para>
+    <para><filename>/etc/systemd/logind.conf</filename></para>
+    <para><filename>/etc/systemd/logind.conf.d/*.conf</filename></para>
     <para><filename>/run/systemd/logind.conf.d/*.conf</filename></para>
-    <para><filename>&rootlibexecdir;/logind.conf.d/*.conf</filename></para>
+    <para><filename>/usr/lib/systemd/logind.conf.d/*.conf</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
diff --git a/man/machine-id.xml b/man/machine-id.xml
index bb7cd7f..92d67a3 100644
--- a/man/machine-id.xml
+++ b/man/machine-id.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/machine-info.xml b/man/machine-info.xml
index a6db1e0..916f1da 100644
--- a/man/machine-info.xml
+++ b/man/machine-info.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/machinectl.xml b/man/machinectl.xml
index 18ef6a5..50cbb1b 100644
--- a/man/machinectl.xml
+++ b/man/machinectl.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
@@ -588,8 +585,8 @@
         first verified with detached GPG signature file
         <filename>SHA256SUMS.gpg</filename>. The public key for this
         verification step needs to be available in
-        <filename>&rootlibexecdir;/import-pubring.gpg</filename> or
-        <filename>&pkgsysconfdir;/import-pubring.gpg</filename>.</para>
+        <filename>/usr/lib/systemd/import-pubring.gpg</filename> or
+        <filename>/etc/systemd/import-pubring.gpg</filename>.</para>
 
         <para>The container image will be downloaded and stored in a
         read-only subvolume in
diff --git a/man/modules-load.d.xml b/man/modules-load.d.xml
index 82a98be..4b722aa 100644
--- a/man/modules-load.d.xml
+++ b/man/modules-load.d.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
diff --git a/man/networkctl.xml b/man/networkctl.xml
index 402698c..d11d60f 100644
--- a/man/networkctl.xml
+++ b/man/networkctl.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/nss-myhostname.xml b/man/nss-myhostname.xml
index 7379213..2d36df6 100644
--- a/man/nss-myhostname.xml
+++ b/man/nss-myhostname.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/nss-mymachines.xml b/man/nss-mymachines.xml
index a3e6c75..eb1ed25 100644
--- a/man/nss-mymachines.xml
+++ b/man/nss-mymachines.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/os-release.xml b/man/os-release.xml
index 6ce5885..4ca2e59 100644
--- a/man/os-release.xml
+++ b/man/os-release.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/pam_systemd.xml b/man/pam_systemd.xml
index 6fdbcf9..b4a3f50 100644
--- a/man/pam_systemd.xml
+++ b/man/pam_systemd.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/resolved.conf.xml b/man/resolved.conf.xml
index 52329eb..8047a4e 100644
--- a/man/resolved.conf.xml
+++ b/man/resolved.conf.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
@@ -52,10 +49,10 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>&pkgsysconfdir;/resolved.conf</filename></para>
-    <para><filename>&pkgsysconfdir;/resolved.conf.d/*.conf</filename></para>
+    <para><filename>/etc/systemd/resolved.conf</filename></para>
+    <para><filename>/etc/systemd/resolved.conf.d/*.conf</filename></para>
     <para><filename>/run/systemd/resolved.conf.d/*.conf</filename></para>
-    <para><filename>&rootlibexecdir;/resolved.conf.d/*.conf</filename></para>
+    <para><filename>/usr/lib/systemd/resolved.conf.d/*.conf</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
diff --git a/man/runlevel.xml b/man/runlevel.xml
index f34f958..fc1f523 100644
--- a/man/runlevel.xml
+++ b/man/runlevel.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd-daemon.xml b/man/sd-daemon.xml
index 686ba0c..b7ba363 100644
--- a/man/sd-daemon.xml
+++ b/man/sd-daemon.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd-id128.xml b/man/sd-id128.xml
index 067d43b..ea79720 100644
--- a/man/sd-id128.xml
+++ b/man/sd-id128.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd-journal.xml b/man/sd-journal.xml
index 165284c..9b1a522 100644
--- a/man/sd-journal.xml
+++ b/man/sd-journal.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd-login.xml b/man/sd-login.xml
index 4c4e5f0..328f711 100644
--- a/man/sd-login.xml
+++ b/man/sd-login.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_booted.xml b/man/sd_booted.xml
index 235e78d..4dd674b 100644
--- a/man/sd_booted.xml
+++ b/man/sd_booted.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_bus_creds_get_pid.xml b/man/sd_bus_creds_get_pid.xml
index b9e0811..13f885c 100644
--- a/man/sd_bus_creds_get_pid.xml
+++ b/man/sd_bus_creds_get_pid.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_bus_creds_new_from_pid.xml b/man/sd_bus_creds_new_from_pid.xml
index 36b6bef..8c054a5 100644
--- a/man/sd_bus_creds_new_from_pid.xml
+++ b/man/sd_bus_creds_new_from_pid.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_bus_default.xml b/man/sd_bus_default.xml
index ae0b1a0..fbf10d0 100644
--- a/man/sd_bus_default.xml
+++ b/man/sd_bus_default.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_bus_error.xml b/man/sd_bus_error.xml
index 762f0c0..b8cb339 100644
--- a/man/sd_bus_error.xml
+++ b/man/sd_bus_error.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_bus_message_append.xml b/man/sd_bus_message_append.xml
index 5025bdf..7a4bfa4 100644
--- a/man/sd_bus_message_append.xml
+++ b/man/sd_bus_message_append.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_bus_message_append_array.xml b/man/sd_bus_message_append_array.xml
index fc5ee23..c2adc6f 100644
--- a/man/sd_bus_message_append_array.xml
+++ b/man/sd_bus_message_append_array.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_bus_message_append_basic.xml b/man/sd_bus_message_append_basic.xml
index 82c6957..91eaf87 100644
--- a/man/sd_bus_message_append_basic.xml
+++ b/man/sd_bus_message_append_basic.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_bus_message_append_string_memfd.xml b/man/sd_bus_message_append_string_memfd.xml
index 61c513a..9e99999 100644
--- a/man/sd_bus_message_append_string_memfd.xml
+++ b/man/sd_bus_message_append_string_memfd.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_bus_message_append_strv.xml b/man/sd_bus_message_append_strv.xml
index 57a6864..0f77adcc 100644
--- a/man/sd_bus_message_append_strv.xml
+++ b/man/sd_bus_message_append_strv.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_bus_message_get_cookie.xml b/man/sd_bus_message_get_cookie.xml
index 7f762a3..3328eea 100644
--- a/man/sd_bus_message_get_cookie.xml
+++ b/man/sd_bus_message_get_cookie.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_bus_message_get_monotonic_usec.xml b/man/sd_bus_message_get_monotonic_usec.xml
index c8deecf..4c2c06e 100644
--- a/man/sd_bus_message_get_monotonic_usec.xml
+++ b/man/sd_bus_message_get_monotonic_usec.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_bus_negotiate_fds.xml b/man/sd_bus_negotiate_fds.xml
index d31cb57..f988acf 100644
--- a/man/sd_bus_negotiate_fds.xml
+++ b/man/sd_bus_negotiate_fds.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_bus_new.xml b/man/sd_bus_new.xml
index c1d82bb..5c65b9a 100644
--- a/man/sd_bus_new.xml
+++ b/man/sd_bus_new.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_bus_path_encode.xml b/man/sd_bus_path_encode.xml
index 41c35bd..21c22a8 100644
--- a/man/sd_bus_path_encode.xml
+++ b/man/sd_bus_path_encode.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_bus_request_name.xml b/man/sd_bus_request_name.xml
index a7dc9fe..9b0a93d 100644
--- a/man/sd_bus_request_name.xml
+++ b/man/sd_bus_request_name.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_event_add_child.xml b/man/sd_event_add_child.xml
index 6b53c84..b62d1ee 100644
--- a/man/sd_event_add_child.xml
+++ b/man/sd_event_add_child.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_event_add_defer.xml b/man/sd_event_add_defer.xml
index b991b38..01504bf 100644
--- a/man/sd_event_add_defer.xml
+++ b/man/sd_event_add_defer.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_event_add_signal.xml b/man/sd_event_add_signal.xml
index 1641480..1d0942b 100644
--- a/man/sd_event_add_signal.xml
+++ b/man/sd_event_add_signal.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_event_add_time.xml b/man/sd_event_add_time.xml
index 5fc9172..c5f7aee 100644
--- a/man/sd_event_add_time.xml
+++ b/man/sd_event_add_time.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_event_get_fd.xml b/man/sd_event_get_fd.xml
index 1e46665..ecdbe76 100644
--- a/man/sd_event_get_fd.xml
+++ b/man/sd_event_get_fd.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_event_new.xml b/man/sd_event_new.xml
index 43b5b74..e5a4405 100644
--- a/man/sd_event_new.xml
+++ b/man/sd_event_new.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_event_run.xml b/man/sd_event_run.xml
index 9b50b95..2eab568 100644
--- a/man/sd_event_run.xml
+++ b/man/sd_event_run.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_event_set_name.xml b/man/sd_event_set_name.xml
index eec34d1..72aef89 100644
--- a/man/sd_event_set_name.xml
+++ b/man/sd_event_set_name.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_event_wait.xml b/man/sd_event_wait.xml
index 94f8b5c..397d52a 100644
--- a/man/sd_event_wait.xml
+++ b/man/sd_event_wait.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_get_seats.xml b/man/sd_get_seats.xml
index 3f2c666..4390d36 100644
--- a/man/sd_get_seats.xml
+++ b/man/sd_get_seats.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_id128_get_machine.xml b/man/sd_id128_get_machine.xml
index 02fa2da..2ad1f8f 100644
--- a/man/sd_id128_get_machine.xml
+++ b/man/sd_id128_get_machine.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_id128_randomize.xml b/man/sd_id128_randomize.xml
index c4d7c42..ab449d2 100644
--- a/man/sd_id128_randomize.xml
+++ b/man/sd_id128_randomize.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_id128_to_string.xml b/man/sd_id128_to_string.xml
index 988a646..e70c808 100644
--- a/man/sd_id128_to_string.xml
+++ b/man/sd_id128_to_string.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_is_fifo.xml b/man/sd_is_fifo.xml
index 57dd6af..627cb87 100644
--- a/man/sd_is_fifo.xml
+++ b/man/sd_is_fifo.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_journal_add_match.xml b/man/sd_journal_add_match.xml
index fe89cbf..420f563 100644
--- a/man/sd_journal_add_match.xml
+++ b/man/sd_journal_add_match.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_journal_get_catalog.xml b/man/sd_journal_get_catalog.xml
index 2ff3fc2..c19eb11 100644
--- a/man/sd_journal_get_catalog.xml
+++ b/man/sd_journal_get_catalog.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_journal_get_cursor.xml b/man/sd_journal_get_cursor.xml
index 1d38bac..a400d8b 100644
--- a/man/sd_journal_get_cursor.xml
+++ b/man/sd_journal_get_cursor.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_journal_get_cutoff_realtime_usec.xml b/man/sd_journal_get_cutoff_realtime_usec.xml
index ae5e638..23e7cc6 100644
--- a/man/sd_journal_get_cutoff_realtime_usec.xml
+++ b/man/sd_journal_get_cutoff_realtime_usec.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_journal_get_data.xml b/man/sd_journal_get_data.xml
index b395fe0..1afbd73 100644
--- a/man/sd_journal_get_data.xml
+++ b/man/sd_journal_get_data.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_journal_get_fd.xml b/man/sd_journal_get_fd.xml
index 51dcb1a..3a38f73 100644
--- a/man/sd_journal_get_fd.xml
+++ b/man/sd_journal_get_fd.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_journal_get_realtime_usec.xml b/man/sd_journal_get_realtime_usec.xml
index 921aa77..607d746 100644
--- a/man/sd_journal_get_realtime_usec.xml
+++ b/man/sd_journal_get_realtime_usec.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_journal_get_usage.xml b/man/sd_journal_get_usage.xml
index a89b779..72c804d 100644
--- a/man/sd_journal_get_usage.xml
+++ b/man/sd_journal_get_usage.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_journal_next.xml b/man/sd_journal_next.xml
index 216d9a5..115fe26 100644
--- a/man/sd_journal_next.xml
+++ b/man/sd_journal_next.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_journal_open.xml b/man/sd_journal_open.xml
index f6aac75..fb57280 100644
--- a/man/sd_journal_open.xml
+++ b/man/sd_journal_open.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_journal_print.xml b/man/sd_journal_print.xml
index 6dbf73f..0cd0b45 100644
--- a/man/sd_journal_print.xml
+++ b/man/sd_journal_print.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_journal_query_unique.xml b/man/sd_journal_query_unique.xml
index 5c92f89..ac0e5f6 100644
--- a/man/sd_journal_query_unique.xml
+++ b/man/sd_journal_query_unique.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_journal_seek_head.xml b/man/sd_journal_seek_head.xml
index d4c13c2..d74c2d5 100644
--- a/man/sd_journal_seek_head.xml
+++ b/man/sd_journal_seek_head.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_journal_stream_fd.xml b/man/sd_journal_stream_fd.xml
index ae7990e..2ea7731 100644
--- a/man/sd_journal_stream_fd.xml
+++ b/man/sd_journal_stream_fd.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_listen_fds.xml b/man/sd_listen_fds.xml
index 38e159b..9b9705e 100644
--- a/man/sd_listen_fds.xml
+++ b/man/sd_listen_fds.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_login_monitor_new.xml b/man/sd_login_monitor_new.xml
index ef97dae..a7b47a3 100644
--- a/man/sd_login_monitor_new.xml
+++ b/man/sd_login_monitor_new.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_machine_get_class.xml b/man/sd_machine_get_class.xml
index 68babd1..5b881cc 100644
--- a/man/sd_machine_get_class.xml
+++ b/man/sd_machine_get_class.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_notify.xml b/man/sd_notify.xml
index d563bcf..87e59c9 100644
--- a/man/sd_notify.xml
+++ b/man/sd_notify.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_pid_get_session.xml b/man/sd_pid_get_session.xml
index 05a3961..b46d471 100644
--- a/man/sd_pid_get_session.xml
+++ b/man/sd_pid_get_session.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_seat_get_active.xml b/man/sd_seat_get_active.xml
index 74b4ed5..3c57ec9 100644
--- a/man/sd_seat_get_active.xml
+++ b/man/sd_seat_get_active.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_session_is_active.xml b/man/sd_session_is_active.xml
index e3af2b3..4ca3a6c 100644
--- a/man/sd_session_is_active.xml
+++ b/man/sd_session_is_active.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_uid_get_state.xml b/man/sd_uid_get_state.xml
index 18a3427..b158f35 100644
--- a/man/sd_uid_get_state.xml
+++ b/man/sd_uid_get_state.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/sd_watchdog_enabled.xml b/man/sd_watchdog_enabled.xml
index 4185010..991431f 100644
--- a/man/sd_watchdog_enabled.xml
+++ b/man/sd_watchdog_enabled.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/shutdown.xml b/man/shutdown.xml
index 9bf599b..a8af387 100644
--- a/man/shutdown.xml
+++ b/man/shutdown.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/standard-conf.xml b/man/standard-conf.xml
index 123877a..004f53f 100644
--- a/man/standard-conf.xml
+++ b/man/standard-conf.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refsection PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-          "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+          "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 
 <refsection>
   <refsection id='confd'>
@@ -42,14 +39,14 @@
     <para>Default configuration is defined during compilation, so a
     configuration file is only needed when it is necessary to deviate
     from those defaults. By default the configuration file in
-    <filename>&pkgsysconfdir;/</filename> contains commented out entries
+    <filename>/etc/systemd/</filename> contains commented out entries
     showing the defaults as a guide to the administrator. This file
     can be edited to create local overrides.
     </para>
 
     <para>When packages need to customize the configuration, they can
     install configuration snippets in
-    <filename>&rootlibexecdir;/*.conf.d/</filename>. Files in
+    <filename>/usr/lib/systemd/*.conf.d/</filename>. Files in
     <filename>/etc/</filename> are reserved for the local
     administrator, who may use this logic to override the
     configuration files installed by vendor packages. The main
diff --git a/man/standard-options.xml b/man/standard-options.xml
index 5adda7c..f214463 100644
--- a/man/standard-options.xml
+++ b/man/standard-options.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-          "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+          "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 
 <variablelist>
   <varlistentry id='help'>
diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml
index 841cedb..8a13179 100644
--- a/man/sysctl.d.xml
+++ b/man/sysctl.d.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0"?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -130,7 +127,7 @@
       <para><filename>/etc/udev/rules.d/99-bridge.rules</filename>:
       </para>
 
-      <programlisting>ACTION=="add", SUBSYSTEM=="module", KERNEL=="bridge", RUN+="&rootlibexecdir;/systemd-sysctl --prefix=/net/bridge"
+      <programlisting>ACTION=="add", SUBSYSTEM=="module", KERNEL=="bridge", RUN+="/usr/lib/systemd/systemd-sysctl --prefix=/net/bridge"
 </programlisting>
 
       <para><filename>/etc/sysctl.d/bridge.conf</filename>:
diff --git a/man/systemd-activate.xml b/man/systemd-activate.xml
index 3aecc40..3b854fd 100644
--- a/man/systemd-activate.xml
+++ b/man/systemd-activate.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
@@ -53,7 +50,7 @@
 
   <refsynopsisdiv>
     <cmdsynopsis>
-      <command>&rootlibexecdir;/systemd-activate</command>
+      <command>/usr/lib/systemd/systemd-activate</command>
       <arg choice="opt" rep="repeat">OPTIONS</arg>
       <arg choice="plain"><replaceable>daemon</replaceable></arg>
       <arg choice="opt" rep="repeat">OPTIONS</arg>
@@ -152,13 +149,13 @@
     <example>
       <title>Run an echo server on port 2000</title>
 
-      <programlisting>$ &rootlibexecdir;/systemd-activate -l 2000 -a cat</programlisting>
+      <programlisting>$ /usr/lib/systemd/systemd-activate -l 2000 -a cat</programlisting>
     </example>
 
     <example>
       <title>Run a socket activated instance of <citerefentry><refentrytitle>systemd-journal-gatewayd</refentrytitle><manvolnum>8</manvolnum></citerefentry></title>
 
-      <programlisting>$ &rootlibexecdir;/systemd-activate -l 19531 &rootlibexecdir;/systemd-journal-gatewayd</programlisting>
+      <programlisting>$ /usr/lib/systemd/systemd-activate -l 19531 /usr/lib/systemd/systemd-journal-gatewayd</programlisting>
     </example>
   </refsect1>
 
diff --git a/man/systemd-analyze.xml b/man/systemd-analyze.xml
index 3509d15..1983150 100644
--- a/man/systemd-analyze.xml
+++ b/man/systemd-analyze.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/systemd-ask-password-console.service.xml b/man/systemd-ask-password-console.service.xml
index 488a879..479e5f2 100644
--- a/man/systemd-ask-password-console.service.xml
+++ b/man/systemd-ask-password-console.service.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
diff --git a/man/systemd-ask-password.xml b/man/systemd-ask-password.xml
index 2402103..877c71a 100644
--- a/man/systemd-ask-password.xml
+++ b/man/systemd-ask-password.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/systemd-backlight at .service.xml b/man/systemd-backlight at .service.xml
index 1235762..a259f5d 100644
--- a/man/systemd-backlight at .service.xml
+++ b/man/systemd-backlight at .service.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -51,7 +48,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-backlight at .service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-backlight</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-backlight</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
diff --git a/man/systemd-binfmt.service.xml b/man/systemd-binfmt.service.xml
index 8659e63..66d2643 100644
--- a/man/systemd-binfmt.service.xml
+++ b/man/systemd-binfmt.service.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -51,7 +48,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-binfmt.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-binfmt</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-binfmt</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
diff --git a/man/systemd-bootchart.xml b/man/systemd-bootchart.xml
index ea8a783..5386667 100644
--- a/man/systemd-bootchart.xml
+++ b/man/systemd-bootchart.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
@@ -63,7 +60,7 @@
       usage, as well as per-process information from a running system.
       Collected results are output as an SVG graph. Normally,
       systemd-bootchart is invoked by the kernel by passing
-      <option>init=<filename>&rootlibexecdir;/systemd-bootchart</filename></option>
+      <option>init=<filename>/usr/lib/systemd/systemd-bootchart</filename></option>
       on the kernel command line. systemd-bootchart will then fork the
       real init off to resume normal system startup, while monitoring
       and logging startup information in the background.
@@ -109,7 +106,7 @@
         <listitem><para>The kernel can invoke
         <command>systemd-bootchart</command> instead of the init
         process. In turn, <command>systemd-bootchart</command> will
-        invoke <command>&rootlibexecdir;/systemd</command>.
+        invoke <command>/usr/lib/systemd/systemd</command>.
         </para></listitem>
       </varlistentry>
 
@@ -131,7 +128,7 @@
     <title>Options</title>
 
     <para>These options can also be set in the
-    <filename>&pkgsysconfdir;/bootchart.conf</filename> file. See
+    <filename>/etc/systemd/bootchart.conf</filename> file. See
     <citerefentry project='man-pages'><refentrytitle>bootchart.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
     </para>
 
@@ -204,7 +201,7 @@
         <term><option>-i</option></term>
         <term><option>--init <replaceable>path</replaceable></option></term>
         <listitem><para>Use this init binary. Defaults to
-        <command>&rootlibexecdir;/systemd</command>.
+        <command>/usr/lib/systemd/systemd</command>.
         </para></listitem>
       </varlistentry>
 
diff --git a/man/systemd-bus-proxyd.xml b/man/systemd-bus-proxyd.xml
index f7b94cd..63652b1 100644
--- a/man/systemd-bus-proxyd.xml
+++ b/man/systemd-bus-proxyd.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
@@ -53,7 +50,7 @@
 
   <refsynopsisdiv>
     <cmdsynopsis>
-      <command>&rootlibexecdir;/systemd-bus-proxyd</command>
+      <command>/usr/lib/systemd/systemd-bus-proxyd</command>
       <arg choice="opt" rep="repeat">OPTIONS</arg>
       <arg choice="opt"><replaceable>PLACEHOLDER</replaceable></arg>
     </cmdsynopsis>
diff --git a/man/systemd-bus-proxyd at .service.xml b/man/systemd-bus-proxyd at .service.xml
index 4ac6ba0..e6e0a8e 100644
--- a/man/systemd-bus-proxyd at .service.xml
+++ b/man/systemd-bus-proxyd at .service.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/systemd-cat.xml b/man/systemd-cat.xml
index d51acd7..9b1a880 100644
--- a/man/systemd-cat.xml
+++ b/man/systemd-cat.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/systemd-cgls.xml b/man/systemd-cgls.xml
index d3b2404..e8f0368 100644
--- a/man/systemd-cgls.xml
+++ b/man/systemd-cgls.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/systemd-cgtop.xml b/man/systemd-cgtop.xml
index 969edd0..d4b041a 100644
--- a/man/systemd-cgtop.xml
+++ b/man/systemd-cgtop.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/systemd-coredump.xml b/man/systemd-coredump.xml
index d40562b..5da3857 100644
--- a/man/systemd-coredump.xml
+++ b/man/systemd-coredump.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
@@ -52,7 +49,7 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>&rootlibexecdir;/systemd-coredump</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-coredump</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
diff --git a/man/systemd-cryptsetup-generator.xml b/man/systemd-cryptsetup-generator.xml
index c4747f7..b627035 100644
--- a/man/systemd-cryptsetup-generator.xml
+++ b/man/systemd-cryptsetup-generator.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -49,7 +46,7 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>&rootlibexecdir;/system-generators/systemd-cryptsetup-generator</filename></para>
+    <para><filename>/usr/lib/systemd/system-generators/systemd-cryptsetup-generator</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
diff --git a/man/systemd-cryptsetup at .service.xml b/man/systemd-cryptsetup at .service.xml
index efc213a..ea52485 100644
--- a/man/systemd-cryptsetup at .service.xml
+++ b/man/systemd-cryptsetup at .service.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -51,7 +48,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-cryptsetup at .service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-cryptsetup</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-cryptsetup</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
diff --git a/man/systemd-debug-generator.xml b/man/systemd-debug-generator.xml
index 075ec58..5c5e9fc 100644
--- a/man/systemd-debug-generator.xml
+++ b/man/systemd-debug-generator.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -50,7 +47,7 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>&rootlibexecdir;/system-generators/systemd-debug-generator</filename></para>
+    <para><filename>/usr/lib/systemd/system-generators/systemd-debug-generator</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
diff --git a/man/systemd-delta.xml b/man/systemd-delta.xml
index 69ea041..6a6460f 100644
--- a/man/systemd-delta.xml
+++ b/man/systemd-delta.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml
index 16ac4f3..40755a2 100644
--- a/man/systemd-detect-virt.xml
+++ b/man/systemd-detect-virt.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/systemd-efi-boot-generator.xml b/man/systemd-efi-boot-generator.xml
index 1f8194d..23464bc 100644
--- a/man/systemd-efi-boot-generator.xml
+++ b/man/systemd-efi-boot-generator.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -51,7 +48,7 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>&rootlibexecdir;/system-generators/systemd-efi-boot-generator</filename></para>
+    <para><filename>/usr/lib/systemd/system-generators/systemd-efi-boot-generator</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
diff --git a/man/systemd-escape.xml b/man/systemd-escape.xml
index 6680bcf..0c3b230 100644
--- a/man/systemd-escape.xml
+++ b/man/systemd-escape.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/systemd-firstboot.xml b/man/systemd-firstboot.xml
index 6ec54bf..67289da 100644
--- a/man/systemd-firstboot.xml
+++ b/man/systemd-firstboot.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/systemd-fsck at .service.xml b/man/systemd-fsck at .service.xml
index 7286cd8..e4ffcba 100644
--- a/man/systemd-fsck at .service.xml
+++ b/man/systemd-fsck at .service.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -53,7 +50,7 @@
   <refsynopsisdiv>
     <para><filename>systemd-fsck at .service</filename></para>
     <para><filename>systemd-fsck-root.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-fsck</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-fsck</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
diff --git a/man/systemd-fstab-generator.xml b/man/systemd-fstab-generator.xml
index 383aab7..c09ed4b 100644
--- a/man/systemd-fstab-generator.xml
+++ b/man/systemd-fstab-generator.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -49,7 +46,7 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>&rootlibexecdir;/system-generators/systemd-fstab-generator</filename></para>
+    <para><filename>/usr/lib/systemd/system-generators/systemd-fstab-generator</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
diff --git a/man/systemd-getty-generator.xml b/man/systemd-getty-generator.xml
index 12127d9..3389259 100644
--- a/man/systemd-getty-generator.xml
+++ b/man/systemd-getty-generator.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -50,7 +47,7 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>&rootlibexecdir;/system-generators/systemd-getty-generator</filename></para>
+    <para><filename>/usr/lib/systemd/system-generators/systemd-getty-generator</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
diff --git a/man/systemd-gpt-auto-generator.xml b/man/systemd-gpt-auto-generator.xml
index d3e02d6..710c2e0 100644
--- a/man/systemd-gpt-auto-generator.xml
+++ b/man/systemd-gpt-auto-generator.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -53,7 +50,7 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>&rootlibexecdir;/system-generators/systemd-gpt-auto-generator</filename></para>
+    <para><filename>/usr/lib/systemd/system-generators/systemd-gpt-auto-generator</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
diff --git a/man/systemd-halt.service.xml b/man/systemd-halt.service.xml
index 7e83a88..c94e2a1 100644
--- a/man/systemd-halt.service.xml
+++ b/man/systemd-halt.service.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
@@ -59,7 +56,7 @@
     <para><filename>systemd-poweroff.service</filename></para>
     <para><filename>systemd-reboot.service</filename></para>
     <para><filename>systemd-kexec.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-shutdown</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-shutdown</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
@@ -78,7 +75,7 @@
 
     <para>When these services are run, they ensure that PID 1 is
     replaced by the
-    <filename>&rootlibexecdir;/systemd-shutdown</filename> tool which
+    <filename>/usr/lib/systemd/systemd-shutdown</filename> tool which
     is then responsible for the actual shutdown. Before shutting down,
     this binary will try to unmount all remaining file systems,
     disable all remaining swap devices, detach all remaining storage
@@ -93,7 +90,7 @@
     <para>Immediately before executing the actual system
     halt/poweroff/reboot/kexec <filename>systemd-shutdown</filename>
     will run all executables in
-    <filename>&rootlibexecdir;/system-shutdown/</filename> and pass
+    <filename>/usr/lib/systemd/system-shutdown/</filename> and pass
     one arguments to them: either <literal>halt</literal>,
     <literal>poweroff</literal>, <literal>reboot</literal> or
     <literal>kexec</literal>, depending on the chosen action. All
diff --git a/man/systemd-hibernate-resume-generator.xml b/man/systemd-hibernate-resume-generator.xml
index 52837bc..d811b9b 100644
--- a/man/systemd-hibernate-resume-generator.xml
+++ b/man/systemd-hibernate-resume-generator.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -49,7 +46,7 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>&rootlibexecdir;/system-generators/systemd-hibernate-resume-generator</filename></para>
+    <para><filename>/usr/lib/systemd/system-generators/systemd-hibernate-resume-generator</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
diff --git a/man/systemd-hibernate-resume at .service.xml b/man/systemd-hibernate-resume at .service.xml
index bca08b5..7d00827 100644
--- a/man/systemd-hibernate-resume at .service.xml
+++ b/man/systemd-hibernate-resume at .service.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -51,7 +48,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-hibernate-resume at .service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-hibernate-resume</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-hibernate-resume</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
diff --git a/man/systemd-hostnamed.service.xml b/man/systemd-hostnamed.service.xml
index 2db1d03..6990d41 100644
--- a/man/systemd-hostnamed.service.xml
+++ b/man/systemd-hostnamed.service.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
@@ -53,7 +50,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-hostnamed.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-hostnamed</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-hostnamed</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
diff --git a/man/systemd-hwdb.xml b/man/systemd-hwdb.xml
index 9a58776..f1a1402 100644
--- a/man/systemd-hwdb.xml
+++ b/man/systemd-hwdb.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <refentry id="systemd-hwdb" conditional="ENABLE_HWDB">
   <refentryinfo>
@@ -60,7 +57,7 @@
       <varlistentry>
         <term><option>--usr</option></term>
         <listitem>
-          <para>Generate in &udevlibexecdir; instead of /etc/udev.</para>
+          <para>Generate in /usr/lib/udev instead of /etc/udev.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
diff --git a/man/systemd-inhibit.xml b/man/systemd-inhibit.xml
index 6ff0721..9d85908 100644
--- a/man/systemd-inhibit.xml
+++ b/man/systemd-inhibit.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/systemd-initctl.service.xml b/man/systemd-initctl.service.xml
index 95288d0..5c7f9a4 100644
--- a/man/systemd-initctl.service.xml
+++ b/man/systemd-initctl.service.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
@@ -55,7 +52,7 @@
   <refsynopsisdiv>
     <para><filename>systemd-initctl.service</filename></para>
     <para><filename>systemd-initctl.socket</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-initctl</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-initctl</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
diff --git a/man/systemd-journal-gatewayd.service.xml b/man/systemd-journal-gatewayd.service.xml
index f758879..6df2248 100644
--- a/man/systemd-journal-gatewayd.service.xml
+++ b/man/systemd-journal-gatewayd.service.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
@@ -57,7 +54,7 @@
     <para><filename>systemd-journal-gatewayd.service</filename></para>
     <para><filename>systemd-journal-gatewayd.socket</filename></para>
     <cmdsynopsis>
-      <command>&rootlibexecdir;/systemd-journal-gatewayd</command>
+      <command>/usr/lib/systemd/systemd-journal-gatewayd</command>
       <arg choice="opt" rep="repeat">OPTIONS</arg>
     </cmdsynopsis>
   </refsynopsisdiv>
diff --git a/man/systemd-journal-remote.xml b/man/systemd-journal-remote.xml
index 596479e..ebaca26 100644
--- a/man/systemd-journal-remote.xml
+++ b/man/systemd-journal-remote.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/systemd-journal-upload.xml b/man/systemd-journal-upload.xml
index 5398ff4..597f2a2 100644
--- a/man/systemd-journal-upload.xml
+++ b/man/systemd-journal-upload.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
@@ -246,8 +243,8 @@ openssl ca -batch -config ca.conf -notext -in $CLIENT.csr -out $CLIENT.pem
       <varname>TrustedCertificateFile=</varname>,
       <varname>ServerCertificateFile=</varname>,
       <varname>ServerKeyFile=</varname>, in
-      <filename>&pkgsysconfdir;/journal-remote.conf</filename> and
-      <filename>&pkgsysconfdir;/journal-upload.conf</filename>
+      <filename>/etc/systemd/journal-remote.conf</filename> and
+      <filename>/etc/systemd/journal-upload.conf</filename>
       respectively. The default locations can be queried by using
       <command>systemd-journal-remote --help</command> and
       <command>systemd-journal-upload --help</command>.</para>
diff --git a/man/systemd-journald.service.xml b/man/systemd-journald.service.xml
index ead1eee..8280d6c 100644
--- a/man/systemd-journald.service.xml
+++ b/man/systemd-journald.service.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
@@ -57,7 +54,7 @@
     <para><filename>systemd-journald.service</filename></para>
     <para><filename>systemd-journald.socket</filename></para>
     <para><filename>systemd-journald-dev-log.socket</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-journald</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-journald</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
@@ -202,7 +199,7 @@
 
     <variablelist>
       <varlistentry>
-        <term><filename>&pkgsysconfdir;/journald.conf</filename></term>
+        <term><filename>/etc/systemd/journald.conf</filename></term>
 
         <listitem><para>Configure
         <command>systemd-journald</command>
diff --git a/man/systemd-localed.service.xml b/man/systemd-localed.service.xml
index 1628054..06aa78c 100644
--- a/man/systemd-localed.service.xml
+++ b/man/systemd-localed.service.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
@@ -53,7 +50,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-localed.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-localed</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-localed</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
diff --git a/man/systemd-logind.service.xml b/man/systemd-logind.service.xml
index 1416d88..5733e42 100644
--- a/man/systemd-logind.service.xml
+++ b/man/systemd-logind.service.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
@@ -53,7 +50,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-logind.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-logind</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-logind</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
diff --git a/man/systemd-machine-id-commit.service.xml b/man/systemd-machine-id-commit.service.xml
index 7bda76c..7c8fc08 100644
--- a/man/systemd-machine-id-commit.service.xml
+++ b/man/systemd-machine-id-commit.service.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -50,7 +47,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-machine-id-commit.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-machine-id-commit</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-machine-id-commit</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
diff --git a/man/systemd-machine-id-commit.xml b/man/systemd-machine-id-commit.xml
index 0ebbfe7..cfb1722 100644
--- a/man/systemd-machine-id-commit.xml
+++ b/man/systemd-machine-id-commit.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml
index 5a84a3b..182717f 100644
--- a/man/systemd-machine-id-setup.xml
+++ b/man/systemd-machine-id-setup.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/systemd-machined.service.xml b/man/systemd-machined.service.xml
index a62e42c..999aeee 100644
--- a/man/systemd-machined.service.xml
+++ b/man/systemd-machined.service.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
@@ -53,7 +50,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-machined.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-machined</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-machined</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
diff --git a/man/systemd-modules-load.service.xml b/man/systemd-modules-load.service.xml
index dc9e2a8..dacd083 100644
--- a/man/systemd-modules-load.service.xml
+++ b/man/systemd-modules-load.service.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -51,7 +48,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-modules-load.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-modules-load</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-modules-load</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
diff --git a/man/systemd-networkd-wait-online.service.xml b/man/systemd-networkd-wait-online.service.xml
index 157671d..f53b337 100644
--- a/man/systemd-networkd-wait-online.service.xml
+++ b/man/systemd-networkd-wait-online.service.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
@@ -53,7 +50,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-networkd-wait-online.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-networkd-wait-online</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-networkd-wait-online</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
diff --git a/man/systemd-networkd.service.xml b/man/systemd-networkd.service.xml
index 1eef5b7..0bfe551 100644
--- a/man/systemd-networkd.service.xml
+++ b/man/systemd-networkd.service.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
@@ -53,7 +50,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-networkd.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-networkd</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-networkd</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
@@ -78,10 +75,10 @@
 
   <refsect1><title>Configuration Files</title>
     <para>The configuration files are read from the files located in the
-    system network directory <filename>&rootlibexecdir;/network</filename>,
+    system network directory <filename>/usr/lib/systemd/network</filename>,
     the volatile runtime network directory
     <filename>/run/systemd/network</filename> and the local administration
-    network directory <filename>&pkgsysconfdir;/network</filename>.</para>
+    network directory <filename>/etc/systemd/network</filename>.</para>
 
     <para>Networks are configured in <filename>.network</filename>
     files, see
diff --git a/man/systemd-notify.xml b/man/systemd-notify.xml
index 1158473..06d5ae5 100644
--- a/man/systemd-notify.xml
+++ b/man/systemd-notify.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index 218c729..06285ed 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/systemd-path.xml b/man/systemd-path.xml
index 185a0cc..dfc75ee 100644
--- a/man/systemd-path.xml
+++ b/man/systemd-path.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/systemd-quotacheck.service.xml b/man/systemd-quotacheck.service.xml
index 7673635..9d49762 100644
--- a/man/systemd-quotacheck.service.xml
+++ b/man/systemd-quotacheck.service.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -51,7 +48,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-quotacheck.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-quotacheck</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-quotacheck</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
diff --git a/man/systemd-random-seed.service.xml b/man/systemd-random-seed.service.xml
index 580c351..8c83668 100644
--- a/man/systemd-random-seed.service.xml
+++ b/man/systemd-random-seed.service.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -51,7 +48,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-random-seed.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-random-seed</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-random-seed</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
diff --git a/man/systemd-remount-fs.service.xml b/man/systemd-remount-fs.service.xml
index c8c3d16..9bc07fc 100644
--- a/man/systemd-remount-fs.service.xml
+++ b/man/systemd-remount-fs.service.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -51,7 +48,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-remount-fs.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-remount-fs</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-remount-fs</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
diff --git a/man/systemd-resolved.service.xml b/man/systemd-resolved.service.xml
index 892ebff..89ec5f8 100644
--- a/man/systemd-resolved.service.xml
+++ b/man/systemd-resolved.service.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
@@ -53,7 +50,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-resolved.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-resolved</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-resolved</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
diff --git a/man/systemd-rfkill at .service.xml b/man/systemd-rfkill at .service.xml
index befe001..709b09d 100644
--- a/man/systemd-rfkill at .service.xml
+++ b/man/systemd-rfkill at .service.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -51,7 +48,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-rfkill at .service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-rfkill</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-rfkill</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
diff --git a/man/systemd-run.xml b/man/systemd-run.xml
index ddd08e5..71b365c 100644
--- a/man/systemd-run.xml
+++ b/man/systemd-run.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/systemd-sleep.conf.xml b/man/systemd-sleep.conf.xml
index c5d26d0..9a379ec 100644
--- a/man/systemd-sleep.conf.xml
+++ b/man/systemd-sleep.conf.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
@@ -52,10 +49,10 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>&pkgsysconfdir;/sleep.conf</filename></para>
-    <para><filename>&pkgsysconfdir;/sleep.conf.d/*.conf</filename></para>
+    <para><filename>/etc/systemd/sleep.conf</filename></para>
+    <para><filename>/etc/systemd/sleep.conf.d/*.conf</filename></para>
     <para><filename>/run/systemd/sleep.conf.d/*.conf</filename></para>
-    <para><filename>&rootlibexecdir;/sleep.conf.d/*.conf</filename></para>
+    <para><filename>/usr/lib/systemd/sleep.conf.d/*.conf</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
@@ -122,7 +119,7 @@
 
     <para>The following options can be configured in the
     <literal>[Sleep]</literal> section of
-    <filename>&pkgsysconfdir;/sleep.conf</filename> or a
+    <filename>/etc/systemd/sleep.conf</filename> or a
     <filename>sleep.conf.d</filename> file:</para>
 
     <variablelist class='systemd-directives'>
diff --git a/man/systemd-socket-proxyd.xml b/man/systemd-socket-proxyd.xml
index dc3baef..ae4217b 100644
--- a/man/systemd-socket-proxyd.xml
+++ b/man/systemd-socket-proxyd.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0"?>
 <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-     "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+     "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -116,7 +113,7 @@ Requires=nginx.service
 After=nginx.service
 
 [Service]
-ExecStart=]]>&rootlibexecdir;<![CDATA[/systemd-socket-proxyd /tmp/nginx.sock
+ExecStart=/usr/lib/systemd/systemd-socket-proxyd /tmp/nginx.sock
 PrivateTmp=yes
 PrivateNetwork=yes]]></programlisting>
       </example>
@@ -159,7 +156,7 @@ After=nginx.service
 JoinsNamespaceOf=nginx.service
 
 [Service]
-ExecStart=]]>&rootlibexecdir;<![CDATA[/systemd-socket-proxyd 127.0.0.1:8080
+ExecStart=/usr/lib/systemd/systemd-socket-proxyd 127.0.0.1:8080
 PrivateTmp=yes
 PrivateNetwork=yes]]></programlisting>
       </example>
diff --git a/man/systemd-suspend.service.xml b/man/systemd-suspend.service.xml
index 2722d18..a8beb86 100644
--- a/man/systemd-suspend.service.xml
+++ b/man/systemd-suspend.service.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
@@ -59,7 +56,7 @@
     <para><filename>systemd-suspend.service</filename></para>
     <para><filename>systemd-hibernate.service</filename></para>
     <para><filename>systemd-hybrid-sleep.service</filename></para>
-    <para><filename>&rootlibexecdir;/system-sleep</filename></para>
+    <para><filename>/usr/lib/systemd/system-sleep</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
@@ -78,7 +75,7 @@
     <para>Immediately before entering system suspend and/or
     hibernation <filename>systemd-suspend.service</filename> (and the
     other mentioned units, respectively) will run all executables in
-    <filename>&rootlibexecdir;/system-sleep/</filename> and pass two
+    <filename>/usr/lib/systemd/system-sleep/</filename> and pass two
     arguments to them. The first argument will be
     <literal>pre</literal>, the second either
     <literal>suspend</literal>, <literal>hibernate</literal>, or
@@ -90,7 +87,7 @@
     until all executables have finished.</para>
 
     <para>Note that scripts or binaries dropped in
-    <filename>&rootlibexecdir;/system-sleep/</filename> are intended
+    <filename>/usr/lib/systemd/system-sleep/</filename> are intended
     for local use only and should be considered hacks. If applications
     want to be notified of system suspend/hibernation and resume,
     there are much nicer interfaces available.</para>
@@ -107,7 +104,7 @@
     <literal>mem</literal> into <filename>/sys/power/state</filename>,
     to trigger the actual system suspend. What exactly is written
     where can be configured in the <literal>[Sleep]</literal> section
-    of <filename>&pkgsysconfdir;/sleep.conf</filename> or a
+    of <filename>/etc/systemd/sleep.conf</filename> or a
     <filename>sleep.conf.d</filename> file. See
     <citerefentry><refentrytitle>systemd-sleep.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
     </para>
diff --git a/man/systemd-sysctl.service.xml b/man/systemd-sysctl.service.xml
index f7da4cd..d4c1a7e 100644
--- a/man/systemd-sysctl.service.xml
+++ b/man/systemd-sysctl.service.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -51,7 +48,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-sysctl.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-sysctl</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-sysctl</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
diff --git a/man/systemd-system-update-generator.xml b/man/systemd-system-update-generator.xml
index 5c593b3..e7fc95c 100644
--- a/man/systemd-system-update-generator.xml
+++ b/man/systemd-system-update-generator.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -49,7 +46,7 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>&rootlibexecdir;/system-generators/systemd-system-update-generator</filename></para>
+    <para><filename>/usr/lib/systemd/system-generators/systemd-system-update-generator</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index 5aa5da4..c06accd 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
@@ -54,14 +51,14 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>&pkgsysconfdir;/system.conf</filename></para>
-    <para><filename>&pkgsysconfdir;/system.conf.d/*.conf</filename></para>
+    <para><filename>/etc/systemd/system.conf</filename></para>
+    <para><filename>/etc/systemd/system.conf.d/*.conf</filename></para>
     <para><filename>/run/systemd/system.conf.d/*.conf</filename></para>
-    <para><filename>&rootlibexecdir;/system.conf.d/*.conf</filename></para>
-    <para><filename>&pkgsysconfdir;/user.conf</filename></para>
-    <para><filename>&pkgsysconfdir;/user.conf.d/*.conf</filename></para>
+    <para><filename>/usr/lib/systemd/system.conf.d/*.conf</filename></para>
+    <para><filename>/etc/systemd/user.conf</filename></para>
+    <para><filename>/etc/systemd/user.conf.d/*.conf</filename></para>
     <para><filename>/run/systemd/user.conf.d/*.conf</filename></para>
-    <para><filename>&rootlibexecdir;/user.conf.d/*.conf</filename></para>
+    <para><filename>/usr/lib/systemd/user.conf.d/*.conf</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
diff --git a/man/systemd-sysusers.xml b/man/systemd-sysusers.xml
index cbe4f2f..a0c0f99 100644
--- a/man/systemd-sysusers.xml
+++ b/man/systemd-sysusers.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/systemd-sysv-generator.xml b/man/systemd-sysv-generator.xml
index e7592d6..f2d56cb 100644
--- a/man/systemd-sysv-generator.xml
+++ b/man/systemd-sysv-generator.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -49,7 +46,7 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>&rootlibexecdir;/system-generators/systemd-sysv-generator</filename></para>
+    <para><filename>/usr/lib/systemd/system-generators/systemd-sysv-generator</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
diff --git a/man/systemd-timedated.service.xml b/man/systemd-timedated.service.xml
index 3598490..e44163a 100644
--- a/man/systemd-timedated.service.xml
+++ b/man/systemd-timedated.service.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
@@ -53,7 +50,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-timedated.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-timedated</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-timedated</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
diff --git a/man/systemd-timesyncd.service.xml b/man/systemd-timesyncd.service.xml
index a1b3645..ac1af2d 100644
--- a/man/systemd-timesyncd.service.xml
+++ b/man/systemd-timesyncd.service.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
@@ -53,7 +50,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-timesyncd.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-timesyncd</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-timesyncd</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml
index f12f997..ceec06f 100644
--- a/man/systemd-tmpfiles.xml
+++ b/man/systemd-tmpfiles.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/systemd-tty-ask-password-agent.xml b/man/systemd-tty-ask-password-agent.xml
index dac3a3c..2876fab 100644
--- a/man/systemd-tty-ask-password-agent.xml
+++ b/man/systemd-tty-ask-password-agent.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/systemd-udevd.service.xml b/man/systemd-udevd.service.xml
index 7a4b62a..b19b04d 100644
--- a/man/systemd-udevd.service.xml
+++ b/man/systemd-udevd.service.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <refentry id="systemd-udevd.service"
           xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -40,7 +37,7 @@
     <para><filename>systemd-udevd-kernel.socket</filename></para>
 
     <cmdsynopsis>
-      <command>&rootlibexecdir;/systemd-udevd</command>
+      <command>/usr/lib/systemd/systemd-udevd</command>
       <arg><option>--daemon</option></arg>
       <arg><option>--debug</option></arg>
       <arg><option>--children-max=</option></arg>
diff --git a/man/systemd-update-done.service.xml b/man/systemd-update-done.service.xml
index 3f12158..d65f175 100644
--- a/man/systemd-update-done.service.xml
+++ b/man/systemd-update-done.service.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -51,7 +48,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-update-done.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-update-done</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-update-done</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
diff --git a/man/systemd-update-utmp.service.xml b/man/systemd-update-utmp.service.xml
index 2856918..c8a9cb7 100644
--- a/man/systemd-update-utmp.service.xml
+++ b/man/systemd-update-utmp.service.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -54,7 +51,7 @@
   <refsynopsisdiv>
     <para><filename>systemd-update-utmp.service</filename></para>
     <para><filename>systemd-update-utmp-runlevel.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-update-utmp</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-update-utmp</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
diff --git a/man/systemd-user-sessions.service.xml b/man/systemd-user-sessions.service.xml
index 620648c..e75ef11 100644
--- a/man/systemd-user-sessions.service.xml
+++ b/man/systemd-user-sessions.service.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -51,7 +48,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-user-sessions.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-user-sessions</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-user-sessions</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
diff --git a/man/systemd-vconsole-setup.service.xml b/man/systemd-vconsole-setup.service.xml
index 6c6d8e2..7c6ed08 100644
--- a/man/systemd-vconsole-setup.service.xml
+++ b/man/systemd-vconsole-setup.service.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -51,7 +48,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-vconsole-setup.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-vconsole-setup</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-vconsole-setup</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
diff --git a/man/systemd.automount.xml b/man/systemd.automount.xml
index 18c10d0..9561590 100644
--- a/man/systemd.automount.xml
+++ b/man/systemd.automount.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/systemd.device.xml b/man/systemd.device.xml
index 96a20d1..ac6deaf 100644
--- a/man/systemd.device.xml
+++ b/man/systemd.device.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index ea53722..6487772 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -1,8 +1,5 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/systemd.generator.xml b/man/systemd.generator.xml
index 5ce0592..2285e91 100644
--- a/man/systemd.generator.xml
+++ b/man/systemd.generator.xml
@@ -59,14 +59,14 @@
 
     <para>
       <literallayout><filename>/run/systemd/system-generators/*</filename>
-<filename>&pkgsysconfdir;/system-generators/*</filename>
+<filename>/etc/systemd/system-generators/*</filename>
 <filename>/usr/local/lib/systemd/system-generators/*</filename>
 <filename>&systemgeneratordir;/*</filename></literallayout>
     </para>
 
     <para>
       <literallayout><filename>/run/systemd/user-generators/*</filename>
-<filename>&pkgsysconfdir;/user-generators/*</filename>
+<filename>/etc/systemd/user-generators/*</filename>
 <filename>/usr/local/lib/systemd/user-generators/*</filename>
 <filename>&usergeneratordir;/*</filename></literallayout>
     </para>
diff --git a/man/systemd.journal-fields.xml b/man/systemd.journal-fields.xml
index 2cb010c..a101006 100644
--- a/man/systemd.journal-fields.xml
+++ b/man/systemd.journal-fields.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/systemd.kill.xml b/man/systemd.kill.xml
index c51cf81..1292f4f 100644
--- a/man/systemd.kill.xml
+++ b/man/systemd.kill.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/systemd.link.xml b/man/systemd.link.xml
index 723364f..d9b1879 100644
--- a/man/systemd.link.xml
+++ b/man/systemd.link.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
@@ -59,21 +56,21 @@
     <command>net_setup_link</command> udev builtin.</para>
 
     <para>The link files are read from the files located in the system
-    network directory <filename>&rootlibexecdir;/network</filename>,
+    network directory <filename>/usr/lib/systemd/network</filename>,
     the volatile runtime network directory
     <filename>/run/systemd/network</filename>, and the local
     administration network directory
-    <filename>&pkgsysconfdir;/network</filename>. Link files must have
+    <filename>/etc/systemd/network</filename>. Link files must have
     the extension <filename>.link</filename>; other extensions are
     ignored. All link files are collectively sorted and processed in
     lexical order, regardless of the directories in which they live.
     However, files with identical filenames replace each other. Files
     in <filename>/etc</filename> have the highest priority, files in
     <filename>/run</filename> take precedence over files with the same
-    name in <filename>&rootprefix;/lib</filename>. This can be used to
+    name in <filename>/usr/lib</filename>. This can be used to
     override a system-supplied link file with a local file if needed;
     a symlink in <filename>/etc</filename> with the same name as a
-    link file in <filename>&rootprefix;/lib</filename>, pointing to
+    link file in <filename>/usr/lib</filename>, pointing to
     <filename>/dev/null</filename>, disables the link file
     entirely.</para>
 
@@ -387,7 +384,7 @@
   <refsect1>
     <title>Example</title>
     <example>
-      <title>&pkgsysconfdir;/network/wireless.link</title>
+      <title>/etc/systemd/network/wireless.link</title>
 
       <programlisting>[Match]
 MACAddress=12:34:56:78:9a:bc
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index f22c86a..ffffc56 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml
index 786c7d4..01c31c5 100644
--- a/man/systemd.netdev.xml
+++ b/man/systemd.netdev.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
@@ -71,20 +68,20 @@
 
     <para>The <filename>.netdev</filename> files are read from the
     files located in the system network directory
-    <filename>&rootlibexecdir;/network</filename>, the volatile
+    <filename>/usr/lib/systemd/network</filename>, the volatile
     runtime network directory
     <filename>/run/systemd/network</filename> and the local
     administration network directory
-    <filename>&pkgsysconfdir;/network</filename>. All configuration files
+    <filename>/etc/systemd/network</filename>. All configuration files
     are collectively sorted and processed in lexical order, regardless
     of the directories in which they live. However, files with
     identical filenames replace each other. Files in
     <filename>/etc</filename> have the highest priority, files in
     <filename>/run</filename> take precedence over files with the same
-    name in <filename>&rootprefix;/lib</filename>. This can be used to
+    name in <filename>/usr/lib</filename>. This can be used to
     override a system-supplied configuration file with a local file if
     needed; a symlink in <filename>/etc</filename> with the same name
-    as a configuration file in <filename>&rootprefix;/lib</filename>, pointing
+    as a configuration file in <filename>/usr/lib</filename>, pointing
     to <filename>/dev/null</filename>, disables the configuration file
     entirely.</para>
 
@@ -845,7 +842,7 @@
   <refsect1>
     <title>Example</title>
     <example>
-      <title>&pkgsysconfdir;/network/bridge.netdev</title>
+      <title>/etc/systemd/network/bridge.netdev</title>
 
       <programlisting>[NetDev]
 Name=bridge0
@@ -853,7 +850,7 @@ Kind=bridge</programlisting>
     </example>
 
     <example>
-      <title>&pkgsysconfdir;/network/vlan1.netdev</title>
+      <title>/etc/systemd/network/vlan1.netdev</title>
 
       <programlisting>[Match]
 Virtualization=no
@@ -866,7 +863,7 @@ Kind=vlan
 Id=1</programlisting>
     </example>
     <example>
-      <title>&pkgsysconfdir;/network/ipip.netdev</title>
+      <title>/etc/systemd/network/ipip.netdev</title>
       <programlisting>[NetDev]
 Name=ipip-tun
 Kind=ipip
@@ -878,7 +875,7 @@ Remote=192.169.224.239
 TTL=64</programlisting>
     </example>
     <example>
-      <title>&pkgsysconfdir;/network/tap.netdev</title>
+      <title>/etc/systemd/network/tap.netdev</title>
       <programlisting>[NetDev]
 Name=tap-test
 Kind=tap
@@ -888,7 +885,7 @@ MultiQueue=true
 PacketInfo=true</programlisting> </example>
 
     <example>
-      <title>&pkgsysconfdir;/network/sit.netdev</title>
+      <title>/etc/systemd/network/sit.netdev</title>
       <programlisting>[NetDev]
 Name=sit-tun
 Kind=sit
@@ -900,7 +897,7 @@ Remote=10.65.223.239</programlisting>
     </example>
 
     <example>
-      <title>&pkgsysconfdir;/network/gre.netdev</title>
+      <title>/etc/systemd/network/gre.netdev</title>
       <programlisting>[NetDev]
 Name=gre-tun
 Kind=gre
@@ -912,7 +909,7 @@ Remote=10.65.223.239</programlisting>
     </example>
 
     <example>
-      <title>&pkgsysconfdir;/network/vti.netdev</title>
+      <title>/etc/systemd/network/vti.netdev</title>
 
       <programlisting>[NetDev]
 Name=vti-tun
@@ -925,7 +922,7 @@ Remote=10.65.223.239</programlisting>
     </example>
 
     <example>
-      <title>&pkgsysconfdir;/network/veth.netdev</title>
+      <title>/etc/systemd/network/veth.netdev</title>
       <programlisting>[NetDev]
 Name=veth-test
 Kind=veth
@@ -935,7 +932,7 @@ Name=veth-peer</programlisting>
     </example>
 
     <example>
-      <title>&pkgsysconfdir;/network/dummy.netdev</title>
+      <title>/etc/systemd/network/dummy.netdev</title>
       <programlisting>[NetDev]
 Name=dummy-test
 Kind=dummy
diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index 54fef4c..1a2699a 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
@@ -67,20 +64,20 @@
 
     <para>The <filename>.network</filename> files are read from the
     files located in the system network directory
-    <filename>&rootlibexecdir;/network</filename>, the volatile
+    <filename>/usr/lib/systemd/network</filename>, the volatile
     runtime network directory
     <filename>/run/systemd/network</filename> and the local
     administration network directory
-    <filename>&pkgsysconfdir;/network</filename>. All configuration files
+    <filename>/etc/systemd/network</filename>. All configuration files
     are collectively sorted and processed in lexical order, regardless
     of the directories in which they live. However, files with
     identical filenames replace each other. Files in
     <filename>/etc</filename> have the highest priority, files in
     <filename>/run</filename> take precedence over files with the same
-    name in <filename>&rootprefix;/lib</filename>. This can be used to
+    name in <filename>/usr/lib</filename>. This can be used to
     override a system-supplied configuration file with a local file if
     needed; a symlink in <filename>/etc</filename> with the same name
-    as a configuration file in <filename>&rootprefix;/lib</filename>, pointing
+    as a configuration file in <filename>/usr/lib</filename>, pointing
     to <filename>/dev/null</filename>, disables the configuration file
     entirely.</para>
 
@@ -687,7 +684,7 @@
   <refsect1>
     <title>Example</title>
     <example>
-      <title>&pkgsysconfdir;/network/50-static.network</title>
+      <title>/etc/systemd/network/50-static.network</title>
 
       <programlisting>[Match]
 Name=enp2s0
@@ -698,7 +695,7 @@ Gateway=192.168.0.1</programlisting>
     </example>
 
     <example>
-      <title>&pkgsysconfdir;/network/80-dhcp.network</title>
+      <title>/etc/systemd/network/80-dhcp.network</title>
 
       <programlisting>[Match]
 Name=en*
@@ -708,7 +705,7 @@ DHCP=yes</programlisting>
     </example>
 
     <example>
-      <title>&pkgsysconfdir;/network/bridge-static.network</title>
+      <title>/etc/systemd/network/bridge-static.network</title>
 
       <programlisting>[Match]
 Name=bridge0
@@ -720,7 +717,7 @@ DNS=192.168.0.1</programlisting>
     </example>
 
     <example>
-      <title>&pkgsysconfdir;/network/bridge-slave-interface.network</title>
+      <title>/etc/systemd/network/bridge-slave-interface.network</title>
 
       <programlisting>[Match]
 Name=enp2s0
@@ -729,7 +726,7 @@ Name=enp2s0
 Bridge=bridge0</programlisting>
     </example>
     <example>
-      <title>&pkgsysconfdir;/network/ipip.network</title>
+      <title>/etc/systemd/network/ipip.network</title>
 
       <programlisting>[Match]
 Name=em1
@@ -739,7 +736,7 @@ Tunnel=ipip-tun</programlisting>
     </example>
 
     <example>
-      <title>&pkgsysconfdir;/network/sit.network</title>
+      <title>/etc/systemd/network/sit.network</title>
 
       <programlisting>[Match]
 Name=em1
@@ -749,7 +746,7 @@ Tunnel=sit-tun</programlisting>
     </example>
 
     <example>
-      <title>&pkgsysconfdir;/network/gre.network</title>
+      <title>/etc/systemd/network/gre.network</title>
 
       <programlisting>[Match]
 Name=em1
@@ -759,7 +756,7 @@ Tunnel=gre-tun</programlisting>
     </example>
 
     <example>
-      <title>&pkgsysconfdir;/network/vti.network</title>
+      <title>/etc/systemd/network/vti.network</title>
 
       <programlisting>[Match]
 Name=em1
diff --git a/man/systemd.path.xml b/man/systemd.path.xml
index 03b626b..d02bc92 100644
--- a/man/systemd.path.xml
+++ b/man/systemd.path.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/systemd.preset.xml b/man/systemd.preset.xml
index 4667f9d..2f9add8 100644
--- a/man/systemd.preset.xml
+++ b/man/systemd.preset.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -49,12 +46,12 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>&pkgsysconfdir;/system-preset/*.preset</filename></para>
+    <para><filename>/etc/systemd/system-preset/*.preset</filename></para>
     <para><filename>/run/systemd/system-preset/*.preset</filename></para>
-    <para><filename>&rootlibexecdir;/system-preset/*.preset</filename></para>
-    <para><filename>&pkgsysconfdir;/user-preset/*.preset</filename></para>
+    <para><filename>/usr/lib/systemd/system-preset/*.preset</filename></para>
+    <para><filename>/etc/systemd/user-preset/*.preset</filename></para>
     <para><filename>/run/systemd/user-preset/*.preset</filename></para>
-    <para><filename>&rootlibexecdir;/user-preset/*.preset</filename></para>
+    <para><filename>/usr/lib/systemd/user-preset/*.preset</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
@@ -128,7 +125,7 @@
     <para>If the administrator wants to disable a preset file supplied
     by the vendor, the recommended way is to place a symlink to
     <filename>/dev/null</filename> in
-    <filename>&pkgsysconfdir;/system-preset/</filename> bearing the same
+    <filename>/etc/systemd/system-preset/</filename> bearing the same
     filename.</para>
   </refsect1>
 
@@ -136,7 +133,7 @@
     <title>Example</title>
 
     <example>
-      <title>Default off example <filename>&rootlibexecdir;/system-preset/99-default.preset</filename>:</title>
+      <title>Default off example <filename>/usr/lib/systemd/system-preset/99-default.preset</filename>:</title>
 
       <programlisting>disable *</programlisting>
     </example>
@@ -147,7 +144,7 @@
     suchlike.</para>
 
     <example>
-      <title>A GNOME spin example <filename>&rootlibexecdir;/system-preset/50-gnome.preset</filename>:</title>
+      <title>A GNOME spin example <filename>/usr/lib/systemd/system-preset/50-gnome.preset</filename>:</title>
 
       <programlisting>enable gdm.service
 enable colord.service
@@ -165,7 +162,7 @@ enable avahi-daemon.*</programlisting>
     example like the one from the first example above.</para>
 
     <example>
-      <title>Administrator policy <filename>&pkgsysconfdir;/system-preset/00-lennart.preset</filename>:</title>
+      <title>Administrator policy <filename>/etc/systemd/system-preset/00-lennart.preset</filename>:</title>
 
       <programlisting>enable httpd.service
 enable sshd.service
diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml
index 82e21c6..8f4e7a3 100644
--- a/man/systemd.resource-control.xml
+++ b/man/systemd.resource-control.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/systemd.scope.xml b/man/systemd.scope.xml
index f137cb7..fd65a85 100644
--- a/man/systemd.scope.xml
+++ b/man/systemd.scope.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index e261963..191adcd 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/systemd.slice.xml b/man/systemd.slice.xml
index c443528..a501327 100644
--- a/man/systemd.slice.xml
+++ b/man/systemd.slice.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/systemd.snapshot.xml b/man/systemd.snapshot.xml
index 4c1f40e..96069c3 100644
--- a/man/systemd.snapshot.xml
+++ b/man/systemd.snapshot.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
index 1d0fa1b..1e9778b 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/systemd.special.xml b/man/systemd.special.xml
index 8db3050..cf76aaf 100644
--- a/man/systemd.special.xml
+++ b/man/systemd.special.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml
index 4f3f371..d9a3957 100644
--- a/man/systemd.swap.xml
+++ b/man/systemd.swap.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/systemd.target.xml b/man/systemd.target.xml
index 884177e..e790e9b 100644
--- a/man/systemd.target.xml
+++ b/man/systemd.target.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/systemd.time.xml b/man/systemd.time.xml
index 570a20e..da07297 100644
--- a/man/systemd.time.xml
+++ b/man/systemd.time.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/systemd.timer.xml b/man/systemd.timer.xml
index 5f7e804..20890f2 100644
--- a/man/systemd.timer.xml
+++ b/man/systemd.timer.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 8286cf3..0aa1eea 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -64,20 +64,20 @@
     <filename><replaceable>slice</replaceable>.slice</filename>,
     <filename><replaceable>scope</replaceable>.scope</filename></para>
 
-    <para><literallayout><filename>&pkgsysconfdir;/system/*</filename>
+    <para><literallayout><filename>/etc/systemd/system/*</filename>
 <filename>/run/systemd/system/*</filename>
-<filename>&rootlibexecdir;/system/*</filename>
+<filename>/usr/lib/systemd/system/*</filename>
 <filename>...</filename>
     </literallayout></para>
 
     <para><literallayout><filename>$XDG_CONFIG_HOME/systemd/user/*</filename>
 <filename>$HOME/.config/systemd/user/*</filename>
-<filename>&pkgsysconfdir;/user/*</filename>
+<filename>/etc/systemd/user/*</filename>
 <filename>$XDG_RUNTIME_DIR/systemd/user/*</filename>
 <filename>/run/systemd/user/*</filename>
 <filename>$XDG_DATA_HOME/systemd/user/*</filename>
 <filename>$HOME/.local/share/systemd/user/*</filename>
-<filename>&rootlibexecdir;/user/*</filename>
+<filename>/usr/lib/systemd/user/*</filename>
 <filename>...</filename>
     </literallayout></para>
   </refsynopsisdiv>
@@ -287,7 +287,7 @@
         </thead>
         <tbody>
           <row>
-      <entry><filename>&pkgsysconfdir;/system</filename></entry>
+      <entry><filename>/etc/systemd/system</filename></entry>
       <entry>Local configuration</entry>
           </row>
           <row>
@@ -295,7 +295,7 @@
       <entry>Runtime units</entry>
           </row>
           <row>
-      <entry><filename>&rootlibexecdir;/system</filename></entry>
+      <entry><filename>/usr/lib/systemd/system</filename></entry>
       <entry>Units of installed packages</entry>
           </row>
         </tbody>
@@ -326,7 +326,7 @@
       <entry>User configuration (only used when $XDG_CONFIG_HOME is not set)</entry>
           </row>
           <row>
-      <entry><filename>&pkgsysconfdir;/user</filename></entry>
+      <entry><filename>/etc/systemd/user</filename></entry>
       <entry>Local configuration</entry>
           </row>
           <row>
@@ -346,7 +346,7 @@
       <entry>Units of packages that have been installed in the home directory (only used when $XDG_DATA_HOME is not set)</entry>
           </row>
           <row>
-      <entry><filename>&rootlibexecdir;/user</filename></entry>
+      <entry><filename>/usr/lib/systemd/user</filename></entry>
       <entry>Units of packages that have been installed system-wide</entry>
           </row>
         </tbody>
@@ -1296,7 +1296,7 @@ ExecStart=/usr/sbin/foo-daemon
 
       <para>After running <command>systemctl enable</command>, a
       symlink
-      <filename>&pkgsysconfdir;/system/multi-user.target.wants/foo.service</filename>
+      <filename>/etc/systemd/system/multi-user.target.wants/foo.service</filename>
       linking to the actual unit will be created. It tells systemd to
       pull in the unit when starting
       <filename>multi-user.target</filename>. The inverse
@@ -1309,11 +1309,11 @@ ExecStart=/usr/sbin/foo-daemon
 
       <para>There are two methods of overriding vendor settings in
       unit files: copying the unit file from
-      <filename>&rootlibexecdir;/system</filename> to
-      <filename>&pkgsysconfdir;/system</filename> and modifying the
+      <filename>/usr/lib/systemd/system</filename> to
+      <filename>/etc/systemd/system</filename> and modifying the
       chosen settings. Alternatively, one can create a directory named
       <filename><replaceable>unit</replaceable>.d/</filename> within
-      <filename>&pkgsysconfdir;/system</filename> and place a drop-in
+      <filename>/etc/systemd/system</filename> and place a drop-in
       file <filename><replaceable>name</replaceable>.conf</filename>
       there that only changes the specific settings one is interested
       in. Note that multiple such drop-in files are read if
@@ -1343,7 +1343,7 @@ ExecStart=/usr/sbin/foo-daemon
       load paths for further details.</para>
 
       <para>Suppose there is a vendor-supplied unit
-      <filename>&rootlibexecdir;/system/httpd.service</filename> with
+      <filename>/usr/lib/systemd/system/httpd.service</filename> with
       the following contents:</para>
 
       <programlisting>[Unit]
@@ -1375,7 +1375,7 @@ WantedBy=multi-user.target</programlisting>
       the niceness of the service to its default value of 0.</para>
 
       <para>The first possibility is to copy the unit file to
-      <filename>&pkgsysconfdir;/system/httpd.service</filename> and
+      <filename>/etc/systemd/system/httpd.service</filename> and
       change the chosen settings:</para>
 
       <programlisting>[Unit]
@@ -1395,7 +1395,7 @@ WantedBy=multi-user.target</programlisting>
 
       <para>Alternatively, the administrator could create a drop-in
       file
-      <filename>&pkgsysconfdir;/system/httpd.service.d/local.conf</filename>
+      <filename>/etc/systemd/system/httpd.service.d/local.conf</filename>
       with the following contents:</para>
 
       <programlisting>[Unit]
diff --git a/man/systemd.xml b/man/systemd.xml
index 5fa65a3..4556d56 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
@@ -441,7 +438,7 @@
         by <command>pkg-config systemd
         --variable=systemdsystemunitdir</command>. Other directories
         checked are <filename>/usr/local/lib/systemd/system</filename>
-        and <filename>&rootlibexecdir;/system</filename>. User
+        and <filename>/usr/lib/systemd/system</filename>. User
         configuration always takes precedence. <command>pkg-config
         systemd --variable=systemdsystemconfdir</command> returns the
         path of the system configuration directory. Packages should
diff --git a/man/sysusers.d.xml b/man/sysusers.d.xml
index 3085f3d..99aa07a 100644
--- a/man/sysusers.d.xml
+++ b/man/sysusers.d.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
diff --git a/man/telinit.xml b/man/telinit.xml
index ec7e8ea..02d31fb 100644
--- a/man/telinit.xml
+++ b/man/telinit.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/timedatectl.xml b/man/timedatectl.xml
index d7bd052..2d42b41 100644
--- a/man/timedatectl.xml
+++ b/man/timedatectl.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
@@ -213,13 +210,13 @@ Password: ********
 
     <programlisting>$ systemctl status systemd-timesyncd.service
 ● systemd-timesyncd.service - Network Time Synchronization
-   Loaded: loaded (&rootlibexecdir;/system/systemd-timesyncd.service; enabled)
+   Loaded: loaded (/usr/lib/systemd/system/systemd-timesyncd.service; enabled)
    Active: active (running) since Mo 2015-03-30 14:20:38 CEST; 5s ago
      Docs: man:systemd-timesyncd.service(8)
  Main PID: 595 (systemd-timesyn)
    Status: "Using Time Server 216.239.38.15:123 (time4.google.com)."
    CGroup: /system.slice/systemd-timesyncd.service
-           └─595 &rootlibexecdir;/systemd-timesyncd
+           └─595 /usr/lib/systemd/systemd-timesyncd
 ...</programlisting>
     </para>
   </refsect1>
diff --git a/man/timesyncd.conf.xml b/man/timesyncd.conf.xml
index ee054f9..c883685 100644
--- a/man/timesyncd.conf.xml
+++ b/man/timesyncd.conf.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
@@ -52,10 +49,10 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>&pkgsysconfdir;/timesyncd.conf</filename></para>
-    <para><filename>&pkgsysconfdir;/timesyncd.conf.d/*.conf</filename></para>
+    <para><filename>/etc/systemd/timesyncd.conf</filename></para>
+    <para><filename>/etc/systemd/timesyncd.conf.d/*.conf</filename></para>
     <para><filename>/run/systemd/timesyncd.conf.d/*.conf</filename></para>
-    <para><filename>&rootlibexecdir;/timesyncd.conf.d/*.conf</filename></para>
+    <para><filename>/usr/lib/systemd/timesyncd.conf.d/*.conf</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
index c37de65..8d3ed37 100644
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
diff --git a/man/udev.conf.xml b/man/udev.conf.xml
index a10cc3c..e104e53 100644
--- a/man/udev.conf.xml
+++ b/man/udev.conf.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
diff --git a/man/udev.xml b/man/udev.xml
index 70f4f59..4c2e13e 100644
--- a/man/udev.xml
+++ b/man/udev.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <refentry id="udev">
   <refentryinfo>
@@ -58,17 +55,17 @@
 
   <refsect1><title>Rules Files</title>
       <para>The udev rules are read from the files located in the
-      system rules directory <filename>&udevlibexecdir;/rules.d</filename>,
+      system rules directory <filename>/usr/lib/udev/rules.d</filename>,
       the volatile runtime directory <filename>/run/udev/rules.d</filename>
       and the local administration directory <filename>/etc/udev/rules.d</filename>.
       All rules files are collectively sorted and processed in lexical order,
       regardless of the directories in which they live. However, files with
       identical filenames replace each other. Files in <filename>/etc</filename>
       have the highest priority, files in <filename>/run</filename> take precedence
-      over files with the same name in <filename>&rootprefix;/lib</filename>. This can be
+      over files with the same name in <filename>/usr/lib</filename>. This can be
       used to override a system-supplied rules file with a local file if needed;
       a symlink in <filename>/etc</filename> with the same name as a rules file in
-      <filename>&rootprefix;/lib</filename>, pointing to <filename>/dev/null</filename>,
+      <filename>/usr/lib</filename>, pointing to <filename>/dev/null</filename>,
       disables the rules file entirely. Rule files must have the extension
       <filename>.rules</filename>; other extensions are ignored.</para>
 
@@ -424,7 +421,7 @@
                 <listitem>
                   <para>Execute an external program specified as the assigned
                   value. If no absolute path is given, the program is expected
-                  to live in <filename>&udevlibexecdir;</filename>; otherwise, the
+                  to live in <filename>/usr/lib/udev</filename>; otherwise, the
                   absolute path must be specified.</para>
                   <para>This is the default if no <replaceable>type</replaceable>
                   is specified.</para>
diff --git a/man/udevadm.xml b/man/udevadm.xml
index c7ef727..8ef9e23 100644
--- a/man/udevadm.xml
+++ b/man/udevadm.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <refentry id="udevadm">
   <refentryinfo>
diff --git a/man/user-system-options.xml b/man/user-system-options.xml
index 1e415dd..8616c54 100644
--- a/man/user-system-options.xml
+++ b/man/user-system-options.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-          "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+          "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 
 <variablelist>
   <varlistentry id='user'>
diff --git a/man/vconsole.conf.xml b/man/vconsole.conf.xml
index 1c3bdd2..27196d4 100644
--- a/man/vconsole.conf.xml
+++ b/man/vconsole.conf.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.

commit 68a313c5921d32896136e0775ecb375b0be60206
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Jun 18 19:42:59 2015 +0200

    nspawn: suppress warning when /etc/resolv.conf is a valid symlink
    
    In such a case let's suppress the warning (downgrade to LOG_DEBUG),
    under the assumption that the user has no config file to update in its
    place, but a symlink that points to something like resolved's
    automatically managed resolve.conf file.
    
    While we are at it, also stop complaining if we cannot write /etc/resolv.conf
    due to a read-only disk, given that there's little we could do about it.

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index d1154de..4cf2d14 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -1538,7 +1538,16 @@ static int setup_resolv_conf(const char *dest) {
 
         r = copy_file("/etc/resolv.conf", where, O_TRUNC|O_NOFOLLOW, 0644, 0);
         if (r < 0) {
-                log_warning_errno(r, "Failed to copy /etc/resolv.conf to %s: %m", where);
+                /* If the file already exists as symlink, let's
+                 * suppress the warning, under the assumption that
+                 * resolved or something similar runs inside and the
+                 * symlink points there.
+                 *
+                 * If the disk image is read-only, there's also no
+                 * point in complaining.
+                 */
+                log_full_errno(IN_SET(r, -ELOOP, -EROFS) ? LOG_DEBUG : LOG_WARNING, r,
+                               "Failed to copy /etc/resolv.conf to %s: %m", where);
                 return 0;
         }
 

commit ff609b8ecd0e36bfff0ba120932307274d993dc8
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Jun 18 19:40:47 2015 +0200

    update TODO

diff --git a/TODO b/TODO
index 216dc9b..80e6ab5 100644
--- a/TODO
+++ b/TODO
@@ -28,6 +28,9 @@ External:
 
 Features:
 
+* make nspawn's --network-veth switch more powerful:
+  http://lists.freedesktop.org/archives/systemd-devel/2015-June/033121.html
+
 * man: document that unless you use StandardError=null the shell >/dev/stderr won't work in shell scripts in services
 
 * man: clarify that "machinectl show" shows different information than "machinectl status" (no cgroup tree, no IP addresses, ...)

commit 2ef24a16ac054bc06c3a2520e0d8e862eeea65f8
Author: Tom Gundersen <teg at jklm.no>
Date:   Thu Jun 18 19:15:59 2015 +0200

    man: udev_device - finish new_* man page
    
    A description of device_id lacked. We still need to do the other
    udev_device_* man pages.

diff --git a/man/udev_device_new_from_syspath.xml b/man/udev_device_new_from_syspath.xml
index fc147a8..9c4ab7a 100644
--- a/man/udev_device_new_from_syspath.xml
+++ b/man/udev_device_new_from_syspath.xml
@@ -136,10 +136,37 @@
     <constant>c</constant> for character devices, as well as a devnum (see
     <citerefentry><refentrytitle>makedev</refentrytitle><manvolnum>3</manvolnum></citerefentry>).
     <function>udev_device_new_from_subsystem_sysname</function> looks up devices based
-    on the provided subsystem and sysname and
-    <function>udev_device_new_from_device_id</function> looks up devices based on the provided
-    device id (see
-    <citerefentry><refentrytitle>udev_device_get_subsystem</refentrytitle><manvolnum>3</manvolnum></citerefentry>).
+    on the provided subsystem and sysname
+    (see <citerefentry><refentrytitle>udev_device_get_subsystem</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+    and
+    <citerefentry><refentrytitle>udev_device_get_sysname</refentrytitle><manvolnum>3</manvolnum></citerefentry>)
+    and <function>udev_device_new_from_device_id</function> looks up devices based on the provided
+    device id which is a special string in one of the following four forms:
+    <table>
+      <title>Device ID strings</title>
+
+      <tgroup cols='2'>
+        <colspec colname='example' />
+        <colspec colname='explanation' />
+        <thead><row>
+          <entry>Example</entry>
+          <entry>Explanation</entry>
+        </row></thead>
+        <tbody>
+          <row><entry><varname>b8:2</varname></entry>
+          <entry>block device major:minor</entry></row>
+
+          <row><entry><varname>c128:1</varname></entry>
+          <entry>char device major:minor</entry></row>
+
+          <row><entry><varname>n3</varname></entry>
+          <entry>network device ifindex</entry></row>
+
+          <row><entry><varname>+sound:card29</varname></entry>
+          <entry>kernel driver core subsystem:device name</entry></row>
+        </tbody>
+      </tgroup>
+    </table>
     </para>
 
     <para><function>udev_device_new_from_environment</function>

commit 74b1f5276365bbdf02dacec707fb9c40509650b4
Merge: 013e5e7 edf5b3b
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Jun 18 18:57:16 2015 +0200

    Merge pull request #288 from phomes/cgroup-util
    
    cgroup-util: actually use the path callback


commit 013e5e7ddfb5bcaf574bce71be76f45fdc968450
Merge: 26d5692 07ba233
Author: Tom Gundersen <teg at jklm.no>
Date:   Thu Jun 18 18:38:40 2015 +0200

    Merge pull request #285 from poettering/audit-table-fix
    
    Audit table fix


commit 26d5692e32aeda1d9ab671e0517da63084cdd43c
Merge: 39765e5 9ef5d8f
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Jun 18 18:30:31 2015 +0200

    Merge pull request #286 from jsynacek/fix-edit-v3
    
    systemctl: fix edit when EDITOR contains arguments


commit 39765e5f92510ae5d5aa1be39e77d2c5cf2e94a6
Merge: 478b6f8 8f8a521
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Jun 18 18:29:11 2015 +0200

    Merge pull request #289 from michich/hashmap-small-cleanup
    
    a tiny hashmap cleanup


commit edf5b3b8693a4bbc69d9bfae6a3d4f1b612d3e32
Author: Thomas Hindoe Paaboel Andersen <phomes at gmail.com>
Date:   Thu Jun 18 17:21:21 2015 +0200

    cgroup-util: actually use the path callback
    
    We allow to specify a callback but then ignore the result. Looks like a trivial typo.
    From 7b3fd6313c4b07b6f822a9f979d0c22350a401d9#diff-f010fa21ba7b659b519c122743e55604

diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index 66857f1..439c551 100644
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -1776,7 +1776,7 @@ int cg_attach_everywhere(CGroupControllerMask supported, const char *path, pid_t
                         if (!p)
                                 p = path;
 
-                        cg_attach_fallback(n, path, pid);
+                        cg_attach_fallback(n, p, pid);
                 }
 
                 bit <<= 1;

commit 478b6f86a68184146b99cfc6dda746b447f115bc
Merge: c655146 0aee49d
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Jun 18 17:22:59 2015 +0200

    Merge pull request #287 from phomes/master
    
    NEWS: typo fixes


commit 0aee49d5fba2b2ec94e5c069d937004858a04b4f
Author: Thomas Hindoe Paaboel Andersen <phomes at gmail.com>
Date:   Thu Jun 18 17:10:59 2015 +0200

    NEWS: typo fixes

diff --git a/NEWS b/NEWS
index 9fafb27..0532cef 100644
--- a/NEWS
+++ b/NEWS
@@ -9,7 +9,7 @@ CHANGES WITH 221:
           supports both classic D-Bus as well as kdbus as transport
           backend. sd-event is a generic event loop abstraction that
           is built around Linux epoll, but adds features such as event
-          priorization or efficient timer handling. Both APIs are good
+          prioritization or efficient timer handling. Both APIs are good
           choices for C programs looking for a bus and/or event loop
           implementation that is minimal and does not have to be
           portable to other kernels.
@@ -22,7 +22,7 @@ CHANGES WITH 221:
           command line setting has no effect if the kdbus.ko kernel
           module is not installed, in which case kdbus is (obviously)
           also disabled. We encourage all downstream distributions to
-          begin testing kdbus by adding it to the kernel images if the
+          begin testing kdbus by adding it to the kernel images in the
           development distributions, and leaving kdbus support in
           systemd enabled.
 
@@ -30,7 +30,7 @@ CHANGES WITH 221:
           2.26.
 
         * Support for chkconfig (--enable-chkconfig) was removed in
-          favour of calling an abstraction tool
+          favor of calling an abstraction tool
           /lib/systemd/systemd-sysv-install. This needs to be
           implemented for your distribution. See "SYSV INIT.D SCRIPTS"
           in README for details.
@@ -48,7 +48,7 @@ CHANGES WITH 221:
           external project.
 
         * The systemd-cgtop tool learnt a new --raw switch to generate
-          "raw" (machine parseable) output.
+          "raw" (machine parsable) output.
 
         * networkd's IPForwarding= .network file setting learnt the
           new setting "kernel", which ensures that networkd does not
@@ -76,7 +76,7 @@ CHANGES WITH 221:
         Tezduyar Lindskog, Viktar Vauchkevich, Werner Fink, Zbigniew
         Jędrzejewski-Szmek
 
-        -- Berlin, 2015-05-XX
+        -- Berlin, 2015-06-XX
 
 CHANGES WITH 220:
 

commit c65514649680e5d5ee6a118db6e5b20438cb1710
Author: Ronny Chevalier <chevalier.ronny at gmail.com>
Date:   Thu Jun 18 16:23:28 2015 +0200

    NEWS: fix typo

diff --git a/NEWS b/NEWS
index 5a9c619..9fafb27 100644
--- a/NEWS
+++ b/NEWS
@@ -17,7 +17,7 @@ CHANGES WITH 221:
         * kdbus support is no longer compile-time optional. It is now
           always built-in. However, it can still be disabled at
           runtime using the kdbus=0 kernel command line setting, and
-          that setting my by changed to default to off, by specifying
+          that setting may be changed to default to off, by specifying
           --disable-kdbus at build-time. Note though that the kernel
           command line setting has no effect if the kdbus.ko kernel
           module is not installed, in which case kdbus is (obviously)

commit 5617dde9ac2d946f0cd6b2aee58b069659ac7668
Merge: eedb4ac 65d21ff
Author: Daniel Mack <github at zonque.org>
Date:   Thu Jun 18 16:01:58 2015 +0200

    Merge pull request #282 from martinpitt/master
    
    Fix out-of-tree builds and distcheck


commit 9ef5d8f2cb1ea25eb83d741dfd8a9d393757b6db
Author: Jan Synacek <jsynacek at redhat.com>
Date:   Wed Jun 17 13:53:04 2015 +0200

    systemctl: fix edit when EDITOR contains arguments
    
    Correctly support cases when the EDITOR environment variable and friends
    also contain arguments. For example, to run emacs in terminal only, one
    can say:
    
    EDITOR="emacs -nw" systemctl edit myservice

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 23fc946..538838b 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -5855,23 +5855,15 @@ static int run_editor(char **paths) {
 
         if (pid == 0) {
                 const char **args;
-                char *editor;
+                char *editor, **editor_args = NULL;
                 char **tmp_path, **original_path, *p;
-                unsigned i = 1;
+                unsigned n_editor_args = 0, i = 1;
                 size_t argc;
 
                 (void) reset_all_signal_handlers();
                 (void) reset_signal_mask();
 
                 argc = strv_length(paths)/2 + 1;
-                args = newa(const char*, argc + 1);
-
-                args[0] = NULL;
-                STRV_FOREACH_PAIR(original_path, tmp_path, paths) {
-                        args[i] = *tmp_path;
-                        i++;
-                }
-                args[argc] = NULL;
 
                 /* SYSTEMD_EDITOR takes precedence over EDITOR which takes precedence over VISUAL
                  * If neither SYSTEMD_EDITOR nor EDITOR nor VISUAL are present,
@@ -5884,9 +5876,30 @@ static int run_editor(char **paths) {
                         editor = getenv("VISUAL");
 
                 if (!isempty(editor)) {
-                        args[0] = editor;
-                        execvp(editor, (char* const*) args);
+                        editor_args = strv_split(editor, WHITESPACE);
+                        if (!editor_args) {
+                                (void) log_oom();
+                                _exit(EXIT_FAILURE);
+                        }
+                        n_editor_args = strv_length(editor_args);
+                        argc += n_editor_args - 1;
                 }
+                args = newa(const char*, argc + 1);
+
+                if (n_editor_args > 0) {
+                        args[0] = editor_args[0];
+                        for (; i < n_editor_args; i++)
+                                args[i] = editor_args[i];
+                }
+
+                STRV_FOREACH_PAIR(original_path, tmp_path, paths) {
+                        args[i] = *tmp_path;
+                        i++;
+                }
+                args[i] = NULL;
+
+                if (n_editor_args > 0)
+                        execvp(args[0], (char* const*) args);
 
                 FOREACH_STRING(p, "editor", "nano", "vim", "vi") {
                         args[0] = p;

commit 07ba233e9e1f185f8a71eb3e66ce70ccd2a3f7d3
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Jun 18 13:41:09 2015 +0200

    audit: make sure to include libaudit-defined audit events in table
    
    This change hooks up $(audit_list_includes) that was already
    defined since the beginning of the audit type list, but never actually
    made use of.
    
    It thus completes 4733607eec54034d2083534ebff2dad89c28574e.

diff --git a/Makefile.am b/Makefile.am
index 7dc57b1..e3962cc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1283,14 +1283,14 @@ src/basic/cap-from-name.h: src/basic/cap-from-name.gperf
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_capability -H hash_capability_name -p -C <$< >$@
 
-audit_list_includes = -include linux/audit.h missing.h
+audit_list_includes = -include linux/audit.h -include missing.h
 if HAVE_AUDIT
 audit_list_includes += -include libaudit.h
 endif
 
 src/journal/audit_type-list.txt:
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
-	$(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/audit.h -include missing.h - </dev/null | grep -vE 'AUDIT_.*(FIRST|LAST)_' | $(SED) -r -n 's/^#define\s+AUDIT_(\w+)\s+([0-9]{4})\s*$$/\1\t\2/p' | sort -k2 >$@
+	$(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM $(audit_list_includes) - </dev/null | grep -vE 'AUDIT_.*(FIRST|LAST)_' | $(SED) -r -n 's/^#define\s+AUDIT_(\w+)\s+([0-9]{4})\s*$$/\1\t\2/p' | sort -k2 >$@
 
 src/journal/audit_type-to-name.h: src/journal/audit_type-list.txt
 	$(AM_V_at)$(MKDIR_P) $(dir $@)

commit eedb4ac83158bad6f74305612660b4aff6acc6b4
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Jun 18 13:32:18 2015 +0200

    update TODO

diff --git a/TODO b/TODO
index f912645..216dc9b 100644
--- a/TODO
+++ b/TODO
@@ -28,6 +28,8 @@ External:
 
 Features:
 
+* man: document that unless you use StandardError=null the shell >/dev/stderr won't work in shell scripts in services
+
 * man: clarify that "machinectl show" shows different information than "machinectl status" (no cgroup tree, no IP addresses, ...)
 
 * "systemctl daemon-reload" should result in /etc/systemd/system.conf being reloaded by systemd

commit e063e03404f0d36ffe2de90574e4601461d13517
Merge: fd23f9c 4764a54
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Jun 18 13:02:57 2015 +0200

    Merge pull request #247 from shaded-enmity/origin/pullfix
    
    import/pull: fix for the name/reference overwrite


commit 4764a54439e51cc3d3d0858a94a2d03a352a628c
Author: Pavel Odvody <podvody at redhat.com>
Date:   Wed Jun 17 13:25:06 2015 +0200

    import/pull: fix pulling by image digest
    
    When pulling by image digest the identifiers that
    were produced by parsing image digest were later
    overwritten by code parsing image tag.
    This resulted in invalid identifiers being used
    when contacting the remote endpoint, resulting in 404.
    
    Reported here:
    http://lists.freedesktop.org/archives/systemd-devel/2015-June/033039.html

diff --git a/src/import/pull.c b/src/import/pull.c
index ca33d2f..ca7be6b 100644
--- a/src/import/pull.c
+++ b/src/import/pull.c
@@ -245,15 +245,15 @@ static int pull_dkr(int argc, char *argv[], void *userdata) {
         if (digest) {
                 reference = digest + 1;
                 name = strndupa(argv[1], digest - argv[1]);
-        }
-
-        reference = strchr(argv[1], ':');
-        if (reference) {
-                name = strndupa(argv[1], reference - argv[1]);
-                reference++;
         } else {
-                name = argv[1];
-                reference = "latest";
+                reference = strchr(argv[1], ':');
+                if (reference) {
+                        name = strndupa(argv[1], reference - argv[1]);
+                        reference++;
+                } else {
+                        name = argv[1];
+                        reference = "latest";
+                }
         }
 
         if (!dkr_name_is_valid(name)) {

commit fd23f9c9a70e1214507641d327da40d1688b74d7
Author: David Herrmann <dh.herrmann at gmail.com>
Date:   Thu Jun 18 10:18:31 2015 +0200

    test: disable test-barrier by default
    
    The test-barrier binary uses real-time alarms and timeouts to test for
    races in the thread-barrier implementation. Hence, if your system is under
    high load and your scheduler decides to not run test-barrier for
    >BASE_TIME, then the tests are likely to fail.
    
    Two options:
     1) Increase BASE_TIME. This will make the test take significantly longer
        for no real good. Furthermore, it is still not guaranteed that the
        task is scheduled.
     2) Don't rely on real-time timers, but use explicit synchronization. This
        would basically test one barrier implementation with another.. kinda
        ironic.. but maybe something worth looking into.
     3) Disable test-barrier by default.
    
    This patch chooses option 3) and makes sure test-barrier only runs if you
    pass any argument.
    
    Side note:
            test-barrier is written in a way that if it fails under load, but
            does not on idle systems, then it is very _unlikely_ that the
            barrier implementation is the culprit. Hence, it makes little
            sense to run it under load, anyway. It will not improve the test
            coverage of barrier.c, but rather the coverage of the test itself.

diff --git a/src/test/test-barrier.c b/src/test/test-barrier.c
index 2d109a3..f37cb49 100644
--- a/src/test/test-barrier.c
+++ b/src/test/test-barrier.c
@@ -438,6 +438,16 @@ TEST_BARRIER(test_barrier_pending_exit,
         TEST_BARRIER_WAIT_SUCCESS(pid2));
 
 int main(int argc, char *argv[]) {
+        /*
+         * This test uses real-time alarms and sleeps to test for CPU races
+         * explicitly. This is highly fragile if your system is under load. We
+         * already increased the BASE_TIME value to make the tests more robust,
+         * but that just makes the test take significantly longer. Hence,
+         * disable the test by default, so it will not break CI.
+         */
+        if (argc < 2)
+                return EXIT_TEST_SKIP;
+
         log_parse_environment();
         log_open();
 

commit 575ee5e4f76c28c91828637de17e9a5a0da9523d
Merge: b34503a c43516e
Author: Daniel Mack <github at zonque.org>
Date:   Thu Jun 18 10:18:28 2015 +0200

    Merge pull request #281 from michaelolbrich/glibc-2.16-fix
    
    exit-status: add missing include for SIG* defines


commit 65d21ff344cb7013447e14cdcd83cf43b72fd6f8
Author: Martin Pitt <martin.pitt at ubuntu.com>
Date:   Thu Jun 18 08:42:15 2015 +0200

    build-sys: don't dist man/systemd.directives.xml
    
    It depends on man/custom-entities.ent which is (and needs to be) a built file,
    so we need to always build man/systemd.directives.xml as well.
    
    We also need to drop this from update-man-list so that it doesn't get disted
    from Makefile-man.am.
    
    Fixes distcheck failure.
    
    https://github.com/systemd/systemd/issues/215

diff --git a/Makefile-man.am b/Makefile-man.am
index 7d31800..76c9389 100644
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -2142,10 +2142,8 @@ EXTRA_DIST += \
 	man/systemd-vconsole-setup.service.xml \
 	man/systemd.automount.xml \
 	man/systemd.device.xml \
-	man/systemd.directives.xml \
 	man/systemd.exec.xml \
 	man/systemd.generator.xml \
-	man/systemd.index.xml \
 	man/systemd.journal-fields.xml \
 	man/systemd.kill.xml \
 	man/systemd.link.xml \
diff --git a/Makefile.am b/Makefile.am
index ba7f79b..532d5ee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -700,11 +700,10 @@ noinst_DATA += \
 CLEANFILES += \
 	man/index.html
 
-XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml $(top_builddir)/man/*.xml)
 NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES))
 SOURCE_XML_FILES = ${patsubst %,$(top_srcdir)/%,$(filter-out man/systemd.directives.xml,$(NON_INDEX_XML_FILES))}
 
-update-man-list: $(top_srcdir)/tools/make-man-rules.py $(XML_GLOB)
+update-man-list: $(top_srcdir)/tools/make-man-rules.py $(SOURCE_XML_FILES)
 	$(AM_V_GEN)$(PYTHON) $^ > $(top_srcdir)/Makefile-man.tmp
 	$(AM_V_at)mv $(top_srcdir)/Makefile-man.tmp $(top_srcdir)/Makefile-man.am
 	@echo "Makefile-man.am has been regenerated"
@@ -726,7 +725,7 @@ endif
 endif
 
 EXTRA_DIST += \
-	$(XML_FILES) \
+	$(filter-out man/systemd.directives.xml,$(XML_FILES)) \
 	$(HTML_FILES) \
 	$(HTML_ALIAS) \
 	$(man_MANS) \
@@ -735,7 +734,6 @@ EXTRA_DIST += \
 	tools/xml_helper.py \
 	man/systemd.index.xml \
 	man/index.html \
-	man/systemd.directives.xml \
 	man/glib-event-glue.c \
 	$(NULL)
 

commit c43516e075fd5080d431bee2ed354079aadd4ebb
Author: Michael Olbrich <m.olbrich at pengutronix.de>
Date:   Thu Jun 18 09:00:01 2015 +0200

    exit-status: add missing include for SIG* defines
    
    Otherwise building fails with glibc 2.16. It works with glibc >= 2.17
    because it is implicitly included via macro.h -> sys/param.h -> signal.h

diff --git a/src/basic/exit-status.c b/src/basic/exit-status.c
index c09efdd..5ab3682 100644
--- a/src/basic/exit-status.c
+++ b/src/basic/exit-status.c
@@ -20,6 +20,7 @@
 ***/
 
 #include <stdlib.h>
+#include <signal.h>
 
 #include "exit-status.h"
 #include "set.h"

commit 4584eaea927c182ba403420701944022a222a29b
Author: Daniel Mack <daniel at zonque.org>
Date:   Wed Jun 17 22:52:24 2015 +0200

    build-sys: make SOURCE_XML_FILES array relative to $(top_srcdir)
    
    When calling the build commands from another directory than the toplevel:
    
      mkdir build
      cd build
      ../configure [...]
    
    ... the compilation fails with the following error:
    
     GEN      man/systemd.directives.xml
    Traceback (most recent call last):
      File "../tools/make-directive-index.py", line 313, in make_page
        _extract_directives(directive_groups, formatting, page)
      File "../tools/make-directive-index.py", line 191, in _extract_directives
        t = xml_parse(page)
      File "/home/martin/upstream/systemd/tools/xml_helper.py", line 30, in xml_parse
        doc = tree.parse(page, _parser)
      File "lxml.etree.pyx", line 3301, in lxml.etree.parse (src/lxml/lxml.etree.c:72453)
      File "parser.pxi", line 1791, in lxml.etree._parseDocument (src/lxml/lxml.etree.c:105915)
      File "parser.pxi", line 1817, in lxml.etree._parseDocumentFromURL (src/lxml/lxml.etree.c:106214)
      File "parser.pxi", line 1721, in lxml.etree._parseDocFromFile (src/lxml/lxml.etree.c:105213)
      File "parser.pxi", line 1122, in lxml.etree._BaseParser._parseDocFromFile (src/lxml/lxml.etree.c:100163)
      File "parser.pxi", line 580, in lxml.etree._ParserContext._handleParseResultDoc (src/lxml/lxml.etree.c:94286)
      File "parser.pxi", line 690, in lxml.etree._handleParseResult (src/lxml/lxml.etree.c:95722)
      File "parser.pxi", line 618, in lxml.etree._raiseParseError (src/lxml/lxml.etree.c:94754)
    OSError: Error reading file 'man/bootup.xml': failed to load external entity "man/bootup.xml"
    
    That is because the file names in the XML_FILES array are not relative
    to $(top_srcdir), and hence ../tools/make-directive-index.py is called
    with non-existant arguments.
    
    To fix this, call patsubst when generating SOURCE_XML_FILES from
    NON_INDEX_XML_FILES.

diff --git a/Makefile.am b/Makefile.am
index 7dc57b1..ba7f79b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -702,7 +702,7 @@ CLEANFILES += \
 
 XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml $(top_builddir)/man/*.xml)
 NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES))
-SOURCE_XML_FILES = $(filter-out man/systemd.directives.xml,$(NON_INDEX_XML_FILES))
+SOURCE_XML_FILES = ${patsubst %,$(top_srcdir)/%,$(filter-out man/systemd.directives.xml,$(NON_INDEX_XML_FILES))}
 
 update-man-list: $(top_srcdir)/tools/make-man-rules.py $(XML_GLOB)
 	$(AM_V_GEN)$(PYTHON) $^ > $(top_srcdir)/Makefile-man.tmp

commit b34503a7fdf98afd286f00031548bcd7e7e17184
Merge: 867a99b 00dbd90
Author: Kay Sievers <kay at vrfy.org>
Date:   Thu Jun 18 00:45:51 2015 +0200

    Merge pull request #269 from teg/udev-docs-1
    
    man: libudev - add description to udev_device_*


commit 867a99b4061749d51b3350672715eceb9f585570
Merge: 5614713 503546d
Author: Daniel Mack <github at zonque.org>
Date:   Thu Jun 18 00:34:22 2015 +0200

    Merge pull request #272 from poettering/nspawn-flush-copy-fd
    
    nspawn: when exiting, flush all remaining bytes from the pty to stdout


commit 561471314c1a55660063467422509352192e3408
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Jun 18 00:28:06 2015 +0200

    build-sys: bump versions and sonames

diff --git a/Makefile.am b/Makefile.am
index 7cc7044..7dc57b1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,12 +39,12 @@ SUBDIRS = . po
 .PRECIOUS: $(TEST_SUITE_LOG) Makefile
 
 LIBUDEV_CURRENT=7
-LIBUDEV_REVISION=3
+LIBUDEV_REVISION=4
 LIBUDEV_AGE=6
 
-LIBSYSTEMD_CURRENT=7
+LIBSYSTEMD_CURRENT=8
 LIBSYSTEMD_REVISION=0
-LIBSYSTEMD_AGE=7
+LIBSYSTEMD_AGE=8
 
 # The following four libraries only exist for compatibility reasons,
 # their version info should not be bumped anymore
diff --git a/configure.ac b/configure.ac
index e5d3994..0784966 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 AC_PREREQ([2.64])
 
 AC_INIT([systemd],
-        [220],
+        [221],
         [http://github.com/systemd/systemd/issues],
         [systemd],
         [http://www.freedesktop.org/wiki/Software/systemd])

commit bcf1097553f15d17665d036ea6d4803496cc3e26
Merge: 5f92d24 97af81c
Author: Kay Sievers <kay at vrfy.org>
Date:   Thu Jun 18 00:26:46 2015 +0200

    Merge pull request #276 from poettering/dbus-search-path
    
    bus-proxy: add new dbus policy search paths from /usr


commit 5f92d24fa85d6652c4754e3b3b2a3393026bd0b9
Author: Kay Sievers <kay at vrfy.org>
Date:   Thu Jun 18 00:25:17 2015 +0200

    NEWS: update

diff --git a/NEWS b/NEWS
index 0a1f06d..5a9c619 100644
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,7 @@ systemd System and Service Manager
 CHANGES WITH 221:
 
         * The sd-bus.h and sd-event.h APIs have now been declared
-          stable and have been added the official interface of
+          stable and have been added to the official interface of
           libsystemd.so. sd-bus implements an alternative D-Bus client
           library, that is relatively easy to use, very efficient and
           supports both classic D-Bus as well as kdbus as transport
@@ -12,7 +12,7 @@ CHANGES WITH 221:
           priorization or efficient timer handling. Both APIs are good
           choices for C programs looking for a bus and/or event loop
           implementation that is minimal and does not have to be
-          portable to other kenels.
+          portable to other kernels.
 
         * kdbus support is no longer compile-time optional. It is now
           always built-in. However, it can still be disabled at

commit 422c759f3f734cdf7f6d7368da5938b2b17abfe1
Merge: 470e72d 44cf96e
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Jun 18 00:22:22 2015 +0200

    Merge pull request #277 from poettering/journal-interleaving-monotonic
    
    journal: make sure the clock increases strict monotonic


commit 470e72d4081c7d0fd74666b7a45358d5ee2abee1
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Jun 18 00:18:49 2015 +0200

    NEWS: prepare for v221

diff --git a/NEWS b/NEWS
index 2e2d1ce..0a1f06d 100644
--- a/NEWS
+++ b/NEWS
@@ -2,14 +2,81 @@ systemd System and Service Manager
 
 CHANGES WITH 221:
 
-        * Support for chkconfig (--enable-chkconfig) was removed in favour of
-          calling an abstraction /lib/systemd/systemd-sysv-install. This needs
-          to be implemented for your distribution. See "SYSV INIT.D SCRIPTS" in
-          README for details.
-
-        Contributions from: ...
+        * The sd-bus.h and sd-event.h APIs have now been declared
+          stable and have been added the official interface of
+          libsystemd.so. sd-bus implements an alternative D-Bus client
+          library, that is relatively easy to use, very efficient and
+          supports both classic D-Bus as well as kdbus as transport
+          backend. sd-event is a generic event loop abstraction that
+          is built around Linux epoll, but adds features such as event
+          priorization or efficient timer handling. Both APIs are good
+          choices for C programs looking for a bus and/or event loop
+          implementation that is minimal and does not have to be
+          portable to other kenels.
+
+        * kdbus support is no longer compile-time optional. It is now
+          always built-in. However, it can still be disabled at
+          runtime using the kdbus=0 kernel command line setting, and
+          that setting my by changed to default to off, by specifying
+          --disable-kdbus at build-time. Note though that the kernel
+          command line setting has no effect if the kdbus.ko kernel
+          module is not installed, in which case kdbus is (obviously)
+          also disabled. We encourage all downstream distributions to
+          begin testing kdbus by adding it to the kernel images if the
+          development distributions, and leaving kdbus support in
+          systemd enabled.
+
+        * The minimal required util-linux version has been bumped to
+          2.26.
+
+        * Support for chkconfig (--enable-chkconfig) was removed in
+          favour of calling an abstraction tool
+          /lib/systemd/systemd-sysv-install. This needs to be
+          implemented for your distribution. See "SYSV INIT.D SCRIPTS"
+          in README for details.
+
+        * If there's a systemd unit and a SysV init script for the
+          same service name, and the user executes "systemctl enable"
+          for it (or a related call), then this will now enable both
+          (or execute the related operation on both), not just the
+          unit.
+
+        * The libudev API documentation has been converted from gtkdoc
+          into man pages.
+
+        * gudev has been removed from the systemd tree, it is now an
+          external project.
+
+        * The systemd-cgtop tool learnt a new --raw switch to generate
+          "raw" (machine parseable) output.
+
+        * networkd's IPForwarding= .network file setting learnt the
+          new setting "kernel", which ensures that networkd does not
+          change the IP forwarding sysctl from the default kernel
+          state.
+
+        * The systemd-logind bus API now exposes a new boolean
+          property "Docked" that reports whether logind considers the
+          system "docked", i.e. connected to a docking station or not.
+
+        Contributions from: Alex Crawford, Andreas Pokorny, Andrei
+        Borzenkov, Charles Duffy, Colin Guthrie, Cristian Rodríguez,
+        Daniele Medri, Daniel Hahler, Daniel Mack, David Herrmann,
+        David Mohr, Dimitri John Ledkov, Djalal Harouni, dslul, Ed
+        Swierk, Eric Cook, Filipe Brandenburger, Gianpaolo Macario,
+        Harald Hoyer, Iago López Galeiras, Igor Vuk, Jan Synacek,
+        Jason Pleau, Jason S. McMullan, Jean Delvare, Jeff Huang,
+        Jonathan Boulle, Karel Zak, Kay Sievers, kloun, Lennart
+        Poettering, Marc-Antoine Perennou, Marcel Holtmann, Mario
+        Limonciello, Martin Pitt, Michael Biebl, Michael Olbrich,
+        Michal Schmidt, Mike Gilbert, Nick Owens, Pablo Lezaeta Reyes,
+        Patrick Donnelly, Peter Hutterer, Philip Withnall, Ronny
+        Chevalier, Simon McVittie, Susant Sahani, Thomas Hindoe
+        Paaboel Andersen, Tom Gundersen, Torstein Husebø, Umut
+        Tezduyar Lindskog, Viktar Vauchkevich, Werner Fink, Zbigniew
+        Jędrzejewski-Szmek
 
-        -- Berlin, UNRELEASED
+        -- Berlin, 2015-05-XX
 
 CHANGES WITH 220:
 

commit bd4c12ef02f5709c7fb46d785b750ebc3c4170ae
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jun 17 23:54:35 2015 +0200

    hwdb: update databases from upstream

diff --git a/hwdb/20-OUI.hwdb b/hwdb/20-OUI.hwdb
index fa4633d..51f591c 100644
--- a/hwdb/20-OUI.hwdb
+++ b/hwdb/20-OUI.hwdb
@@ -16964,7 +16964,7 @@ OUI:00044E*
  ID_OUI_FROM_DATABASE=CISCO SYSTEMS, INC.
 
 OUI:00044F*
- ID_OUI_FROM_DATABASE=Leukhardt Systemelektronik GmbH
+ ID_OUI_FROM_DATABASE=Schubert System Elektronik Gmbh
 
 OUI:000450*
  ID_OUI_FROM_DATABASE=DMD Computers SRL
@@ -37544,7 +37544,7 @@ OUI:001F48*
  ID_OUI_FROM_DATABASE=Mojix Inc.
 
 OUI:001F49*
- ID_OUI_FROM_DATABASE=Manhattan Technology Limited
+ ID_OUI_FROM_DATABASE=Manhattan TV Ltd
 
 OUI:001F4A*
  ID_OUI_FROM_DATABASE=Albentia Systems S.A.
@@ -41402,7 +41402,7 @@ OUI:002458*
  ID_OUI_FROM_DATABASE=PA Bastion CC
 
 OUI:002459*
- ID_OUI_FROM_DATABASE=ABB STOTZ-KONTAKT GmbH
+ ID_OUI_FROM_DATABASE=ABB Automation products GmbH
 
 OUI:00245A*
  ID_OUI_FROM_DATABASE=Nanjing Panda Electronics Company Limited
@@ -51137,7 +51137,7 @@ OUI:00E05B*
  ID_OUI_FROM_DATABASE=WEST END SYSTEMS CORP.
 
 OUI:00E05C*
- ID_OUI_FROM_DATABASE=MATSUSHITA KOTOBUKI ELECTRONICS INDUSTRIES, LTD.
+ ID_OUI_FROM_DATABASE=Panasonic Healthcare Co., Ltd.
 
 OUI:00E05D*
  ID_OUI_FROM_DATABASE=UNITEC CO., LTD.
@@ -51802,6 +51802,9 @@ OUI:043604*
 OUI:043D98*
  ID_OUI_FROM_DATABASE=ChongQing QingJia Electronics CO.,LTD
 
+OUI:044169*
+ ID_OUI_FROM_DATABASE=GoPro
+
 OUI:0444A1*
  ID_OUI_FROM_DATABASE=TELECON GALICIA,S.A.
 
@@ -52747,6 +52750,9 @@ OUI:0896D7*
 OUI:089758*
  ID_OUI_FROM_DATABASE=Shenzhen Strong Rising Electronics Co.,Ltd DongGuan Subsidiary
 
+OUI:089B4B*
+ ID_OUI_FROM_DATABASE=iKuai Networks
+
 OUI:089E01*
  ID_OUI_FROM_DATABASE=QUANTA COMPUTER INC.
 
@@ -53587,6 +53593,9 @@ OUI:10C73F*
 OUI:10CA81*
  ID_OUI_FROM_DATABASE=PRECIA
 
+OUI:10CC1B*
+ ID_OUI_FROM_DATABASE=Liverock technologies,INC
+
 OUI:10CCDB*
  ID_OUI_FROM_DATABASE=AXIMUM PRODUITS ELECTRONIQUES
 
@@ -53689,6 +53698,9 @@ OUI:14144B*
 OUI:14157C*
  ID_OUI_FROM_DATABASE=TOKYO COSMOS ELECTRIC CO.,LTD.
 
+OUI:141877*
+ ID_OUI_FROM_DATABASE=Dell Inc
+
 OUI:141A51*
  ID_OUI_FROM_DATABASE=Treetech Sistemas Digitais
 
@@ -54604,6 +54616,9 @@ OUI:1C8464*
 OUI:1C86AD*
  ID_OUI_FROM_DATABASE=MCT CO., LTD.
 
+OUI:1C872C*
+ ID_OUI_FROM_DATABASE=ASUSTek  COMPUTER INC
+
 OUI:1C8E5C*
  ID_OUI_FROM_DATABASE=Huawei Technologies Co., Ltd
 
@@ -54841,6 +54856,9 @@ OUI:2037BC*
 OUI:203A07*
  ID_OUI_FROM_DATABASE=Cisco
 
+OUI:203D66*
+ ID_OUI_FROM_DATABASE=ARRIS GROUP, INC.
+
 OUI:204005*
  ID_OUI_FROM_DATABASE=feno GmbH
 
@@ -55246,6 +55264,9 @@ OUI:2469A5*
 OUI:246AAB*
  ID_OUI_FROM_DATABASE=IT-IS International
 
+OUI:246C8A*
+ ID_OUI_FROM_DATABASE=YUKAI Engineering
+
 OUI:246E96*
  ID_OUI_FROM_DATABASE=Dell Inc.
 
@@ -55723,6 +55744,9 @@ OUI:28C7CE*
 OUI:28C825*
  ID_OUI_FROM_DATABASE=DellKing Industrial Co., Ltd
 
+OUI:28C87A*
+ ID_OUI_FROM_DATABASE=Pace plc
+
 OUI:28C914*
  ID_OUI_FROM_DATABASE=Taimag Corporation
 
@@ -55873,6 +55897,9 @@ OUI:2C1F23*
 OUI:2C2172*
  ID_OUI_FROM_DATABASE=Juniper Networks
 
+OUI:2C233A*
+ ID_OUI_FROM_DATABASE=Hewlett Packard
+
 OUI:2C245F*
  ID_OUI_FROM_DATABASE=Babolat VS
 
@@ -56242,6 +56269,9 @@ OUI:301A28*
 OUI:30215B*
  ID_OUI_FROM_DATABASE=Shenzhen Ostar Display Electronic Co.,Ltd
 
+OUI:3029BE*
+ ID_OUI_FROM_DATABASE=Shanghai MRDcom Co.,Ltd
+
 OUI:302DE8*
  ID_OUI_FROM_DATABASE=JDA, LLC (JDA Systems)
 
@@ -56407,6 +56437,9 @@ OUI:30918F*
 OUI:3092F6*
  ID_OUI_FROM_DATABASE=SHANGHAI SUNMON COMMUNICATION TECHNOGY CO.,LTD
 
+OUI:3095E3*
+ ID_OUI_FROM_DATABASE=SHANGHAI SIMCOM LIMITED
+
 OUI:309BAD*
  ID_OUI_FROM_DATABASE=BBK Electronics Corp., Ltd.,
 
@@ -56942,7 +56975,10 @@ OUI:380195*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
 OUI:380197*
- ID_OUI_FROM_DATABASE=Toshiba Samsung Storage Technolgoy Korea Corporation
+ ID_OUI_FROM_DATABASE=TSST Global,Inc
+
+OUI:380546*
+ ID_OUI_FROM_DATABASE=Foctek Photonics, Inc.
 
 OUI:3806B4*
  ID_OUI_FROM_DATABASE=A.D.C. GmbH
@@ -57709,6 +57745,9 @@ OUI:4018B1*
 OUI:4018D7*
  ID_OUI_FROM_DATABASE=Smartronix, Inc.
 
+OUI:401B5F*
+ ID_OUI_FROM_DATABASE=Weifang GoerTek Electronics Co., Ltd.
+
 OUI:401D59*
  ID_OUI_FROM_DATABASE=Biometric Associates, LP
 
@@ -57748,6 +57787,9 @@ OUI:4037AD*
 OUI:403CFC*
  ID_OUI_FROM_DATABASE=Apple
 
+OUI:403DEC*
+ ID_OUI_FROM_DATABASE=HUMAX Co., Ltd.
+
 OUI:404022*
  ID_OUI_FROM_DATABASE=ZIV
 
@@ -58210,6 +58252,9 @@ OUI:44700B*
 OUI:447098*
  ID_OUI_FROM_DATABASE=MING HONG TECHNOLOGY (SHEN ZHEN) LIMITED
 
+OUI:4473D6*
+ ID_OUI_FROM_DATABASE=Logitech
+
 OUI:44746C*
  ID_OUI_FROM_DATABASE=Sony Mobile Communications AB
 
@@ -58306,6 +58351,9 @@ OUI:44AAE8*
 OUI:44ADD9*
  ID_OUI_FROM_DATABASE=Cisco
 
+OUI:44B32D*
+ ID_OUI_FROM_DATABASE=TP-LINK TECHNOLOGIES CO.,LTD
+
 OUI:44B382*
  ID_OUI_FROM_DATABASE=Kuang-chi Institute of Advanced Technology
 
@@ -58597,6 +58645,9 @@ OUI:48B253*
 OUI:48B5A7*
  ID_OUI_FROM_DATABASE=Glory Horse Industries Ltd.
 
+OUI:48B620*
+ ID_OUI_FROM_DATABASE=ROLI Ltd.
+
 OUI:48B8DE*
  ID_OUI_FROM_DATABASE=HOMEWINS TECHNOLOGY CO.,LTD.
 
@@ -59410,6 +59461,9 @@ OUI:50F520*
 OUI:50F61A*
  ID_OUI_FROM_DATABASE=Kunshan JADE Technologies co., Ltd.
 
+OUI:50FA84*
+ ID_OUI_FROM_DATABASE=TP-LINK TECHNOLOGIES CO.,LTD
+
 OUI:50FAAB*
  ID_OUI_FROM_DATABASE=L-tek d.o.o.
 
@@ -60280,6 +60334,9 @@ OUI:5C7757*
 OUI:5C7D5E*
  ID_OUI_FROM_DATABASE=Huawei Technologies Co., Ltd
 
+OUI:5C838F*
+ ID_OUI_FROM_DATABASE=Cisco Systems
+
 OUI:5C8486*
  ID_OUI_FROM_DATABASE=Brightsource Industries Israel LTD
 
@@ -60349,6 +60406,9 @@ OUI:5CB43E*
 OUI:5CB524*
  ID_OUI_FROM_DATABASE=Sony Ericsson Mobile Communications AB
 
+OUI:5CB559*
+ ID_OUI_FROM_DATABASE=CNEX Labs
+
 OUI:5CB6CC*
  ID_OUI_FROM_DATABASE=NovaComm Technologies Inc.
 
@@ -60382,6 +60442,9 @@ OUI:5CCCFF*
 OUI:5CCEAD*
  ID_OUI_FROM_DATABASE=CDYNE Corporation
 
+OUI:5CCF7F*
+ ID_OUI_FROM_DATABASE=Espressif Inc.
+
 OUI:5CD135*
  ID_OUI_FROM_DATABASE=Xtreme Power Systems
 
@@ -60652,6 +60715,9 @@ OUI:607688*
 OUI:6077E2*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:607EDD*
+ ID_OUI_FROM_DATABASE=Microsoft Mobile Oy
+
 OUI:60812B*
  ID_OUI_FROM_DATABASE=Custom Control Concepts
 
@@ -61129,6 +61195,9 @@ OUI:649968*
 OUI:6499A0*
  ID_OUI_FROM_DATABASE=AG Elektronik AB
 
+OUI:649A12*
+ ID_OUI_FROM_DATABASE=P2 Mobile Technologies Limited
+
 OUI:649ABE*
  ID_OUI_FROM_DATABASE=Apple
 
@@ -61330,6 +61399,9 @@ OUI:680AD7*
 OUI:68122D*
  ID_OUI_FROM_DATABASE=Special Instrument Development Co., Ltd.
 
+OUI:681295*
+ ID_OUI_FROM_DATABASE=Lupine Lighting Systems GmbH
+
 OUI:681590*
  ID_OUI_FROM_DATABASE=SAGEMCOM SAS
 
@@ -61408,6 +61480,9 @@ OUI:6854ED*
 OUI:6854F5*
  ID_OUI_FROM_DATABASE=enLighted Inc
 
+OUI:6858C5*
+ ID_OUI_FROM_DATABASE=ZF TRW Automotive
+
 OUI:68597F*
  ID_OUI_FROM_DATABASE=Alcatel Lucent
 
@@ -61720,6 +61795,9 @@ OUI:6C23B9*
 OUI:6C25B9*
  ID_OUI_FROM_DATABASE=BBK Electronics Corp., Ltd.,
 
+OUI:6C2779*
+ ID_OUI_FROM_DATABASE=Microsoft Mobile Oy
+
 OUI:6C2995*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
@@ -62059,6 +62137,9 @@ OUI:70105C*
 OUI:701124*
  ID_OUI_FROM_DATABASE=Apple
 
+OUI:7011AE*
+ ID_OUI_FROM_DATABASE=Music Life LTD
+
 OUI:701404*
  ID_OUI_FROM_DATABASE=Limited Liability Company
 
@@ -62830,6 +62911,9 @@ OUI:74FF7D*
 OUI:78028F*
  ID_OUI_FROM_DATABASE=Adaptive Spectrum and Signal Alignment (ASSIA), Inc.
 
+OUI:780541*
+ ID_OUI_FROM_DATABASE=Queclink Wireless Solutions Co., Ltd
+
 OUI:780738*
  ID_OUI_FROM_DATABASE=Z.U.K. Elzab S.A.
 
@@ -64501,6 +64585,9 @@ OUI:881544*
 OUI:8818AE*
  ID_OUI_FROM_DATABASE=Tamron Co., Ltd
 
+OUI:881B99*
+ ID_OUI_FROM_DATABASE=SHENZHEN XIN FEI JIA ELECTRONIC CO. LTD.
+
 OUI:881DFC*
  ID_OUI_FROM_DATABASE=Cisco
 
@@ -66451,6 +66538,9 @@ OUI:9C8BF1*
 OUI:9C8D1A*
  ID_OUI_FROM_DATABASE=INTEG process group inc
 
+OUI:9C8DD3*
+ ID_OUI_FROM_DATABASE=Leonton Technologies
+
 OUI:9C8E99*
  ID_OUI_FROM_DATABASE=Hewlett-Packard Company
 
@@ -66841,6 +66931,9 @@ OUI:A08C9B*
 OUI:A090DE*
  ID_OUI_FROM_DATABASE=VEEDIMS,LLC
 
+OUI:A09169*
+ ID_OUI_FROM_DATABASE=LG Electronics
+
 OUI:A09347*
  ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD.
 
@@ -67105,6 +67198,9 @@ OUI:A433D1*
 OUI:A434D9*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
+OUI:A43831*
+ ID_OUI_FROM_DATABASE=RF elements s.r.o.
+
 OUI:A438FC*
  ID_OUI_FROM_DATABASE=Plastic Logic
 
@@ -67372,6 +67468,9 @@ OUI:A4DB2E*
 OUI:A4DB30*
  ID_OUI_FROM_DATABASE=Liteon Technology Corporation
 
+OUI:A4DCBE*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:A4DE50*
  ID_OUI_FROM_DATABASE=Total Walther GmbH
 
@@ -67927,6 +68026,9 @@ OUI:AC7A4D*
 OUI:AC7BA1*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
+OUI:AC7E8A*
+ ID_OUI_FROM_DATABASE=Cisco Systems
+
 OUI:AC7F3E*
  ID_OUI_FROM_DATABASE=Apple
 
@@ -67957,6 +68059,9 @@ OUI:AC867E*
 OUI:AC87A3*
  ID_OUI_FROM_DATABASE=Apple
 
+OUI:AC8995*
+ ID_OUI_FROM_DATABASE=AzureWave Technology Inc.
+
 OUI:AC8ACD*
  ID_OUI_FROM_DATABASE=ROGER D.Wensker, G.Wensker sp.j.
 
@@ -68035,6 +68140,9 @@ OUI:ACBEB6*
 OUI:ACC2EC*
  ID_OUI_FROM_DATABASE=CLT INT'L IND. CORP.
 
+OUI:ACC51B*
+ ID_OUI_FROM_DATABASE=Zhuhai Pantum Electronics Co., Ltd.
+
 OUI:ACC595*
  ID_OUI_FROM_DATABASE=Graphite Systems
 
@@ -68290,6 +68398,9 @@ OUI:B075D5*
 OUI:B077AC*
  ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
 
+OUI:B078F0*
+ ID_OUI_FROM_DATABASE=Beijing HuaqinWorld Technology Co.,Ltd.
+
 OUI:B07908*
  ID_OUI_FROM_DATABASE=Cummings Engineering
 
@@ -68926,6 +69037,9 @@ OUI:B838CA*
 OUI:B83A7B*
  ID_OUI_FROM_DATABASE=Worldplay (Canada) Inc.
 
+OUI:B83A9D*
+ ID_OUI_FROM_DATABASE=FIVE INTERACTIVE, LLC
+
 OUI:B83D4E*
  ID_OUI_FROM_DATABASE=Shenzhen Cultraview Digital Technology Co.,Ltd Shanghai Branch
 
@@ -69697,6 +69811,9 @@ OUI:C02BFC*
 OUI:C02C7A*
  ID_OUI_FROM_DATABASE=Shen Zhen Horn audio Co., Ltd.
 
+OUI:C02DEE*
+ ID_OUI_FROM_DATABASE=Cuff
+
 OUI:C0335E*
  ID_OUI_FROM_DATABASE=Microsoft
 
@@ -71428,6 +71545,9 @@ OUI:D0B53D*
 OUI:D0B5C2*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
+OUI:D0BAE4*
+ ID_OUI_FROM_DATABASE=Shanghai MXCHIP Information Technology Co., Ltd.
+
 OUI:D0BB80*
  ID_OUI_FROM_DATABASE=SHL Telemedicine International Ltd.
 
@@ -71554,6 +71674,9 @@ OUI:D404CD*
 OUI:D40598*
  ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
 
+OUI:D40AA9*
+ ID_OUI_FROM_DATABASE=ARRIS GROUP, INC.
+
 OUI:D40B1A*
  ID_OUI_FROM_DATABASE=HTC Corporation
 
@@ -71788,6 +71911,9 @@ OUI:D4945A*
 OUI:D494A1*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
+OUI:D494E8*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:D49524*
  ID_OUI_FROM_DATABASE=Clover Network, Inc.
 
@@ -71801,7 +71927,7 @@ OUI:D49A20*
  ID_OUI_FROM_DATABASE=Apple
 
 OUI:D49C28*
- ID_OUI_FROM_DATABASE=JayBird Gear LLC
+ ID_OUI_FROM_DATABASE=JayBird LLC
 
 OUI:D49C8E*
  ID_OUI_FROM_DATABASE=University of FUKUI
@@ -72454,6 +72580,9 @@ OUI:DC3E51*
 OUI:DC3EF8*
  ID_OUI_FROM_DATABASE=Nokia Corporation
 
+OUI:DC4427*
+ ID_OUI_FROM_DATABASE=IEEE REGISTRATION AUTHORITY  - Please see MAM public listing for more information.
+
 OUI:DC4517*
  ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
 
@@ -73285,6 +73414,9 @@ OUI:E4BAD9*
 OUI:E4C146*
  ID_OUI_FROM_DATABASE=Objetivos y Servicios de Valor A
 
+OUI:E4C2D1*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:E4C62B*
  ID_OUI_FROM_DATABASE=Airware
 
@@ -73384,6 +73516,9 @@ OUI:E8056D*
 OUI:E80688*
  ID_OUI_FROM_DATABASE=Apple
 
+OUI:E80734*
+ ID_OUI_FROM_DATABASE=Champion Optical Network Engineering, LLC
+
 OUI:E807BF*
  ID_OUI_FROM_DATABASE=SHENZHEN BOOMTECH INDUSTRY CO.,LTD
 
@@ -73981,6 +74116,9 @@ OUI:ECB1D7*
 OUI:ECB541*
  ID_OUI_FROM_DATABASE=SHINANO E and E Co.Ltd.
 
+OUI:ECB870*
+ ID_OUI_FROM_DATABASE=Beijing Heweinet Technology Co.,Ltd.
+
 OUI:ECB907*
  ID_OUI_FROM_DATABASE=CloudGenix Inc
 
@@ -74026,6 +74164,9 @@ OUI:ECD9D1*
 OUI:ECDE3D*
  ID_OUI_FROM_DATABASE=Lamprey Networks, Inc.
 
+OUI:ECDF3A*
+ ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
+
 OUI:ECE09B*
  ID_OUI_FROM_DATABASE=Samsung electronics CO., LTD
 
@@ -74668,6 +74809,9 @@ OUI:F47F35*
 OUI:F48139*
  ID_OUI_FROM_DATABASE=CANON INC.
 
+OUI:F483CD*
+ ID_OUI_FROM_DATABASE=TP-LINK TECHNOLOGIES CO.,LTD
+
 OUI:F48771*
  ID_OUI_FROM_DATABASE=Infoblox
 
@@ -75082,6 +75226,9 @@ OUI:F895C7*
 OUI:F897CF*
  ID_OUI_FROM_DATABASE=DAESHIN-INFORMATION TECHNOLOGY CO., LTD.
 
+OUI:F898B9*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:F89955*
  ID_OUI_FROM_DATABASE=Fortress Technology Inc
 
@@ -75529,9 +75676,6 @@ OUI:FCB698*
 OUI:FCBBA1*
  ID_OUI_FROM_DATABASE=Shenzhen Minicreate Technology Co.,Ltd
 
-OUI:FCC233*
- ID_OUI_FROM_DATABASE=ASUSTek COMPUTER INC.
-
 OUI:FCC23D*
  ID_OUI_FROM_DATABASE=Atmel Corporation
 
diff --git a/hwdb/20-pci-vendor-model.hwdb b/hwdb/20-pci-vendor-model.hwdb
index 4cc7cfd..065f898 100644
--- a/hwdb/20-pci-vendor-model.hwdb
+++ b/hwdb/20-pci-vendor-model.hwdb
@@ -6185,6 +6185,9 @@ pci:v00001002d00006820sv000017AAsd00003643*
 pci:v00001002d00006820sv000017AAsd00003801*
  ID_MODEL_FROM_DATABASE=Venus XTX [Radeon HD 8890M / R9 M275X/M375X] (Radeon R9 M275)
 
+pci:v00001002d00006820sv000017AAsd00003824*
+ ID_MODEL_FROM_DATABASE=Venus XTX [Radeon HD 8890M / R9 M275X/M375X] (Radeon R9 M375)
+
 pci:v00001002d00006821*
  ID_MODEL_FROM_DATABASE=Venus XT [Radeon HD 8870M / R9 M270X/M370X]
 
@@ -6197,6 +6200,9 @@ pci:v00001002d00006821sv00001028sd000005CC*
 pci:v00001002d00006821sv00001028sd000015CC*
  ID_MODEL_FROM_DATABASE=Venus XT [Radeon HD 8870M / R9 M270X/M370X] (FirePro M5100)
 
+pci:v00001002d00006821sv0000106Bsd00000149*
+ ID_MODEL_FROM_DATABASE=Venus XT [Radeon HD 8870M / R9 M270X/M370X] (Radeon R9 M370X Mac Edition)
+
 pci:v00001002d00006822*
  ID_MODEL_FROM_DATABASE=Venus PRO [Radeon E8860]
 
@@ -28940,6 +28946,9 @@ pci:v000010DEd00001140sv00001025sd00000857*
 pci:v000010DEd00001140sv00001025sd00000858*
  ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/810M/820M / GT 620M/625M/630M/720M] (GeForce 820M)
 
+pci:v000010DEd00001140sv00001025sd00000863*
+ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/810M/820M / GT 620M/625M/630M/720M] (GeForce 820M)
+
 pci:v000010DEd00001140sv00001025sd00000868*
  ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/810M/820M / GT 620M/625M/630M/720M] (GeForce 820M)
 
@@ -28979,6 +28988,9 @@ pci:v000010DEd00001140sv00001025sd0000092E*
 pci:v000010DEd00001140sv00001025sd0000092F*
  ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/810M/820M / GT 620M/625M/630M/720M] (GeForce 820M)
 
+pci:v000010DEd00001140sv00001025sd00000932*
+ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/810M/820M / GT 620M/625M/630M/720M] (GeForce 820M)
+
 pci:v000010DEd00001140sv00001025sd0000093A*
  ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/810M/820M / GT 620M/625M/630M/720M] (GeForce 820M)
 
@@ -31698,7 +31710,7 @@ pci:v00001103d00000641*
  ID_MODEL_FROM_DATABASE=RocketRAID 640L 4 Port SATA-III Controller
 
 pci:v00001103d00000642*
- ID_MODEL_FROM_DATABASE=RocketRAID 642L 2 Port SATA-III Controller (eSATA)
+ ID_MODEL_FROM_DATABASE=RocketRAID 642L SATA-III Controller (2 eSATA ports + 2 internal SATA ports)
 
 pci:v00001103d00000644*
  ID_MODEL_FROM_DATABASE=RocketRAID 644 4 Port SATA-III Controller (eSATA)
@@ -32283,64 +32295,64 @@ pci:v00001106d00003022*
  ID_MODEL_FROM_DATABASE=CLE266
 
 pci:v00001106d00003038*
- ID_MODEL_FROM_DATABASE=VT82xxxxx UHCI USB 1.1 Controller
+ ID_MODEL_FROM_DATABASE=VT82xx/62xx UHCI USB 1.1 Controller
 
 pci:v00001106d00003038sv00000925sd00001234*
- ID_MODEL_FROM_DATABASE=VT82xxxxx UHCI USB 1.1 Controller (onboard UHCI USB 1.1 Controller)
+ ID_MODEL_FROM_DATABASE=VT82xx/62xx UHCI USB 1.1 Controller (onboard UHCI USB 1.1 Controller)
 
 pci:v00001106d00003038sv00001019sd00000985*
- ID_MODEL_FROM_DATABASE=VT82xxxxx UHCI USB 1.1 Controller (P6VXA Motherboard)
+ ID_MODEL_FROM_DATABASE=VT82xx/62xx UHCI USB 1.1 Controller (P6VXA Motherboard)
 
 pci:v00001106d00003038sv00001019sd00000A81*
- ID_MODEL_FROM_DATABASE=VT82xxxxx UHCI USB 1.1 Controller (L7VTA v1.0 Motherboard (KT400-8235))
+ ID_MODEL_FROM_DATABASE=VT82xx/62xx UHCI USB 1.1 Controller (L7VTA v1.0 Motherboard (KT400-8235))
 
 pci:v00001106d00003038sv00001043sd00008080*
- ID_MODEL_FROM_DATABASE=VT82xxxxx UHCI USB 1.1 Controller (A7V333 motherboard)
+ ID_MODEL_FROM_DATABASE=VT82xx/62xx UHCI USB 1.1 Controller (A7V333 motherboard)
 
 pci:v00001106d00003038sv00001043sd0000808C*
- ID_MODEL_FROM_DATABASE=VT82xxxxx UHCI USB 1.1 Controller (VT6202 USB2.0 4 port controller)
+ ID_MODEL_FROM_DATABASE=VT82xx/62xx UHCI USB 1.1 Controller (VT6202 USB2.0 4 port controller)
 
 pci:v00001106d00003038sv00001043sd000080A1*
- ID_MODEL_FROM_DATABASE=VT82xxxxx UHCI USB 1.1 Controller (A7V8X-X motherboard)
+ ID_MODEL_FROM_DATABASE=VT82xx/62xx UHCI USB 1.1 Controller (A7V8X-X motherboard)
 
 pci:v00001106d00003038sv00001043sd000080ED*
- ID_MODEL_FROM_DATABASE=VT82xxxxx UHCI USB 1.1 Controller (A7V600/K8V-X/A8V Deluxe motherboard)
+ ID_MODEL_FROM_DATABASE=VT82xx/62xx UHCI USB 1.1 Controller (A7V600/K8V-X/A8V Deluxe motherboard)
 
 pci:v00001106d00003038sv00001179sd00000001*
- ID_MODEL_FROM_DATABASE=VT82xxxxx UHCI USB 1.1 Controller (Magnia Z310)
+ ID_MODEL_FROM_DATABASE=VT82xx/62xx UHCI USB 1.1 Controller (Magnia Z310)
 
 pci:v00001106d00003038sv00001458sd00005004*
- ID_MODEL_FROM_DATABASE=VT82xxxxx UHCI USB 1.1 Controller (GA-7VAX Mainboard)
+ ID_MODEL_FROM_DATABASE=VT82xx/62xx UHCI USB 1.1 Controller (GA-7VAX Mainboard)
 
 pci:v00001106d00003038sv00001462sd00005901*
- ID_MODEL_FROM_DATABASE=VT82xxxxx UHCI USB 1.1 Controller (KT6 Delta-FIS2R (MS-6590))
+ ID_MODEL_FROM_DATABASE=VT82xx/62xx UHCI USB 1.1 Controller (KT6 Delta-FIS2R (MS-6590))
 
 pci:v00001106d00003038sv00001462sd00007020*
- ID_MODEL_FROM_DATABASE=VT82xxxxx UHCI USB 1.1 Controller (K8T NEO 2 motherboard)
+ ID_MODEL_FROM_DATABASE=VT82xx/62xx UHCI USB 1.1 Controller (K8T NEO 2 motherboard)
 
 pci:v00001106d00003038sv00001462sd00007094*
- ID_MODEL_FROM_DATABASE=VT82xxxxx UHCI USB 1.1 Controller (K8T Neo2-F V2.0)
+ ID_MODEL_FROM_DATABASE=VT82xx/62xx UHCI USB 1.1 Controller (K8T Neo2-F V2.0)
 
 pci:v00001106d00003038sv00001462sd00007120*
- ID_MODEL_FROM_DATABASE=VT82xxxxx UHCI USB 1.1 Controller (KT4AV motherboard)
+ ID_MODEL_FROM_DATABASE=VT82xx/62xx UHCI USB 1.1 Controller (KT4AV motherboard)
 
 pci:v00001106d00003038sv00001462sd00007181*
- ID_MODEL_FROM_DATABASE=VT82xxxxx UHCI USB 1.1 Controller (K8MM3-V mainboard)
+ ID_MODEL_FROM_DATABASE=VT82xx/62xx UHCI USB 1.1 Controller (K8MM3-V mainboard)
 
 pci:v00001106d00003038sv0000147Bsd00001407*
- ID_MODEL_FROM_DATABASE=VT82xxxxx UHCI USB 1.1 Controller (KV8-MAX3 motherboard)
+ ID_MODEL_FROM_DATABASE=VT82xx/62xx UHCI USB 1.1 Controller (KV8-MAX3 motherboard)
 
 pci:v00001106d00003038sv0000182Dsd0000201D*
- ID_MODEL_FROM_DATABASE=VT82xxxxx UHCI USB 1.1 Controller (CN-029 USB2.0 4 port PCI Card)
+ ID_MODEL_FROM_DATABASE=VT82xx/62xx UHCI USB 1.1 Controller (CN-029 USB2.0 4 port PCI Card)
 
 pci:v00001106d00003038sv00001849sd00003038*
- ID_MODEL_FROM_DATABASE=VT82xxxxx UHCI USB 1.1 Controller (K7VT series Motherboards)
+ ID_MODEL_FROM_DATABASE=VT82xx/62xx UHCI USB 1.1 Controller (K7VT series Motherboards)
 
 pci:v00001106d00003038sv000019DAsd0000A179*
- ID_MODEL_FROM_DATABASE=VT82xxxxx UHCI USB 1.1 Controller (ZBOX nano VD01)
+ ID_MODEL_FROM_DATABASE=VT82xx/62xx UHCI USB 1.1 Controller (ZBOX nano VD01)
 
 pci:v00001106d00003038sv00001AF4sd00001100*
- ID_MODEL_FROM_DATABASE=VT82xxxxx UHCI USB 1.1 Controller (QEMU Virtual Machine)
+ ID_MODEL_FROM_DATABASE=VT82xx/62xx UHCI USB 1.1 Controller (QEMU Virtual Machine)
 
 pci:v00001106d00003040*
  ID_MODEL_FROM_DATABASE=VT82C586B ACPI
@@ -32483,6 +32495,9 @@ pci:v00001106d00003059*
 pci:v00001106d00003059sv00001019sd00000A81*
  ID_MODEL_FROM_DATABASE=VT8233/A/8235/8237 AC97 Audio Controller (L7VTA v1.0 Motherboard (KT400-8235))
 
+pci:v00001106d00003059sv00001019sd00001841*
+ ID_MODEL_FROM_DATABASE=VT8233/A/8235/8237 AC97 Audio Controller (M811 (VT8367/VT8235/VT6103) [KT333] motherboard)
+
 pci:v00001106d00003059sv00001019sd00001877*
  ID_MODEL_FROM_DATABASE=VT8233/A/8235/8237 AC97 Audio Controller (K8M800-M2 (V2.0) onboard audio)
 
@@ -32541,7 +32556,7 @@ pci:v00001106d00003059sv0000147Bsd00001407*
  ID_MODEL_FROM_DATABASE=VT8233/A/8235/8237 AC97 Audio Controller (KV8-MAX3 motherboard)
 
 pci:v00001106d00003059sv00001695sd0000300C*
- ID_MODEL_FROM_DATABASE=VT8233/A/8235/8237 AC97 Audio Controller (EP-8KRA2+ Mainboard)
+ ID_MODEL_FROM_DATABASE=VT8233/A/8235/8237 AC97 Audio Controller (Realtek ALC655 audio on EP-8KRA series mainboard)
 
 pci:v00001106d00003059sv00001849sd00000850*
  ID_MODEL_FROM_DATABASE=VT8233/A/8235/8237 AC97 Audio Controller (ASRock 775Dual-880 Pro onboard audio (Realtek ALC850))
@@ -32562,43 +32577,40 @@ pci:v00001106d00003059sv0000A0A0sd00000342*
  ID_MODEL_FROM_DATABASE=VT8233/A/8235/8237 AC97 Audio Controller (AK86-L motherboard)
 
 pci:v00001106d00003065*
- ID_MODEL_FROM_DATABASE=VT6102 [Rhine-II]
+ ID_MODEL_FROM_DATABASE=VT6102/VT6103 [Rhine-II]
 
 pci:v00001106d00003065sv00001043sd000080A1*
- ID_MODEL_FROM_DATABASE=VT6102 [Rhine-II] (A7V8X-X Motherboard)
+ ID_MODEL_FROM_DATABASE=VT6102/VT6103 [Rhine-II] (A7V8X-X Motherboard)
 
 pci:v00001106d00003065sv00001043sd000080ED*
- ID_MODEL_FROM_DATABASE=VT6102 [Rhine-II] (A7V600-X Motherboard)
+ ID_MODEL_FROM_DATABASE=VT6102/VT6103 [Rhine-II] (A7V600-X Motherboard)
 
 pci:v00001106d00003065sv00001106sd00000102*
- ID_MODEL_FROM_DATABASE=VT6102 [Rhine-II] (VT6102 [Rhine II] Embeded Ethernet Controller on VT8235)
+ ID_MODEL_FROM_DATABASE=VT6102/VT6103 [Rhine-II] (VT6102/6103 [Rhine II] Ethernet Controller)
 
 pci:v00001106d00003065sv00001186sd00001400*
- ID_MODEL_FROM_DATABASE=VT6102 [Rhine-II] (DFE-530TX rev A)
+ ID_MODEL_FROM_DATABASE=VT6102/VT6103 [Rhine-II] (DFE-530TX rev A)
 
 pci:v00001106d00003065sv00001186sd00001401*
- ID_MODEL_FROM_DATABASE=VT6102 [Rhine-II] (DFE-530TX rev B)
+ ID_MODEL_FROM_DATABASE=VT6102/VT6103 [Rhine-II] (DFE-530TX rev B)
 
 pci:v00001106d00003065sv000013B9sd00001421*
- ID_MODEL_FROM_DATABASE=VT6102 [Rhine-II] (LD-10/100AL PCI Fast Ethernet Adapter (rev.B))
+ ID_MODEL_FROM_DATABASE=VT6102/VT6103 [Rhine-II] (LD-10/100AL PCI Fast Ethernet Adapter (rev.B))
 
 pci:v00001106d00003065sv00001462sd00007061*
- ID_MODEL_FROM_DATABASE=VT6102 [Rhine-II] (MS-7061)
+ ID_MODEL_FROM_DATABASE=VT6102/VT6103 [Rhine-II] (MS-7061)
 
 pci:v00001106d00003065sv00001462sd00007181*
- ID_MODEL_FROM_DATABASE=VT6102 [Rhine-II] (K8MM3-V mainboard)
+ ID_MODEL_FROM_DATABASE=VT6102/VT6103 [Rhine-II] (K8MM3-V mainboard)
 
 pci:v00001106d00003065sv0000147Bsd00001C09*
- ID_MODEL_FROM_DATABASE=VT6102 [Rhine-II] (NV7 Motherboard)
+ ID_MODEL_FROM_DATABASE=VT6102/VT6103 [Rhine-II] (NV7 Motherboard)
 
 pci:v00001106d00003065sv00001695sd00003005*
- ID_MODEL_FROM_DATABASE=VT6102 [Rhine-II] (VT6103)
-
-pci:v00001106d00003065sv00001695sd0000300C*
- ID_MODEL_FROM_DATABASE=VT6102 [Rhine-II] (Realtek ALC655 sound chip)
+ ID_MODEL_FROM_DATABASE=VT6102/VT6103 [Rhine-II] (VT6103)
 
 pci:v00001106d00003065sv00001849sd00003065*
- ID_MODEL_FROM_DATABASE=VT6102 [Rhine-II] (K7VT series Motherboards)
+ ID_MODEL_FROM_DATABASE=VT6102/VT6103 [Rhine-II] (K7VT series Motherboards)
 
 pci:v00001106d00003068*
  ID_MODEL_FROM_DATABASE=AC'97 Modem Controller
@@ -32618,6 +32630,9 @@ pci:v00001106d00003091*
 pci:v00001106d00003099*
  ID_MODEL_FROM_DATABASE=VT8366/A/7 [Apollo KT266/A/333]
 
+pci:v00001106d00003099sv00001019sd00001841*
+ ID_MODEL_FROM_DATABASE=VT8366/A/7 [Apollo KT266/A/333] (M811 (VT8367/VT8235/VT6103) [KT333] motherboard)
+
 pci:v00001106d00003099sv00001043sd00008064*
  ID_MODEL_FROM_DATABASE=VT8366/A/7 [Apollo KT266/A/333] (A7V266-E Mainboard)
 
@@ -32816,6 +32831,9 @@ pci:v00001106d00003177*
 pci:v00001106d00003177sv00001019sd00000A81*
  ID_MODEL_FROM_DATABASE=VT8235 ISA Bridge (L7VTA v1.0 Motherboard (KT400-8235))
 
+pci:v00001106d00003177sv00001019sd00001841*
+ ID_MODEL_FROM_DATABASE=VT8235 ISA Bridge (M811 (VT8367/VT8235/VT6103) [KT333] motherboard)
+
 pci:v00001106d00003177sv00001043sd0000808C*
  ID_MODEL_FROM_DATABASE=VT8235 ISA Bridge (A7V8X motherboard)
 
@@ -37235,6 +37253,12 @@ pci:v00001186d00004000*
 pci:v00001186d00004001*
  ID_MODEL_FROM_DATABASE=DGE-550SX PCI-X Gigabit Ethernet Adapter
 
+pci:v00001186d00004200*
+ ID_MODEL_FROM_DATABASE=DFE-520TX Fast Ethernet PCI Adapter
+
+pci:v00001186d00004200sv00001186sd00001103*
+ ID_MODEL_FROM_DATABASE=DFE-520TX Fast Ethernet PCI Adapter ((rev. C1))
+
 pci:v00001186d00004300*
  ID_MODEL_FROM_DATABASE=DGE-528T Gigabit Ethernet Adapter
 
@@ -46361,6 +46385,9 @@ pci:v0000144Dd0000A820sv00001028sd00001F96*
 pci:v0000144Dd0000A820sv00001028sd00001F97*
  ID_MODEL_FROM_DATABASE=NVMe SSD Controller 171X (Express Flash NVMe XS1715 SSD 1600GB)
 
+pci:v0000144Dd0000A821*
+ ID_MODEL_FROM_DATABASE=NVMe SSD Controller 172X
+
 pci:v0000144E*
  ID_VENDOR_FROM_DATABASE=OLITEC
 
@@ -56402,6 +56429,9 @@ pci:v00001B03*
 pci:v00001B03d00006100*
  ID_MODEL_FROM_DATABASE=DXT/DXTPro Multiformat Broadcast HD/SD Encoder/Decoder/Transcoder
 
+pci:v00001B03d00007000*
+ ID_MODEL_FROM_DATABASE=D7 Multiformat Broadcast HD/SD Encoder/Decoder/Transcoder
+
 pci:v00001B08*
  ID_VENDOR_FROM_DATABASE=MSC Vertriebs GmbH
 
@@ -56492,9 +56522,48 @@ pci:v00001B36d00000100sv00001AF4sd00001100*
 pci:v00001B37*
  ID_VENDOR_FROM_DATABASE=Signal Processing Devices Sweden AB
 
+pci:v00001B37d00000001*
+ ID_MODEL_FROM_DATABASE=ADQ214
+
+pci:v00001B37d00000003*
+ ID_MODEL_FROM_DATABASE=ADQ114
+
+pci:v00001B37d00000005*
+ ID_MODEL_FROM_DATABASE=ADQ112
+
+pci:v00001B37d0000000E*
+ ID_MODEL_FROM_DATABASE=ADQ108
+
+pci:v00001B37d0000000F*
+ ID_MODEL_FROM_DATABASE=ADQDSP
+
 pci:v00001B37d00000014*
  ID_MODEL_FROM_DATABASE=ADQ412
 
+pci:v00001B37d00000015*
+ ID_MODEL_FROM_DATABASE=ADQ212
+
+pci:v00001B37d0000001B*
+ ID_MODEL_FROM_DATABASE=SDR14
+
+pci:v00001B37d0000001C*
+ ID_MODEL_FROM_DATABASE=ADQ1600
+
+pci:v00001B37d0000001E*
+ ID_MODEL_FROM_DATABASE=ADQ208
+
+pci:v00001B37d0000001F*
+ ID_MODEL_FROM_DATABASE=DSU
+
+pci:v00001B37d00000020*
+ ID_MODEL_FROM_DATABASE=ADQ14
+
+pci:v00001B37d00002014*
+ ID_MODEL_FROM_DATABASE=TX320
+
+pci:v00001B37d00002019*
+ ID_MODEL_FROM_DATABASE=S6000
+
 pci:v00001B39*
  ID_VENDOR_FROM_DATABASE=sTec, Inc.
 
@@ -56915,11 +56984,47 @@ pci:v00001D44d0000A400*
 pci:v00001D5C*
  ID_VENDOR_FROM_DATABASE=Fantasia Trading LLC
 
+pci:v00001D61*
+ ID_VENDOR_FROM_DATABASE=Technobox, Inc.
+
+pci:v00001D65*
+ ID_VENDOR_FROM_DATABASE=Imagine Communications Corp.
+
+pci:v00001D65d000004DE*
+ ID_MODEL_FROM_DATABASE=Taurus/McKinley
+
+pci:v00001D6C*
+ ID_VENDOR_FROM_DATABASE=Atomic Rules LLC
+
+pci:v00001D6Cd00001001*
+ ID_MODEL_FROM_DATABASE=A5PL-E1
+
+pci:v00001D6Cd00001002*
+ ID_MODEL_FROM_DATABASE=A5PL-E7
+
+pci:v00001D6Cd00001003*
+ ID_MODEL_FROM_DATABASE=S5PEDS-AB
+
+pci:v00001D6Cd00001004*
+ ID_MODEL_FROM_DATABASE=KC705-K325
+
+pci:v00001D6Cd00001005*
+ ID_MODEL_FROM_DATABASE=ZC706-Z045
+
+pci:v00001D6Cd00001006*
+ ID_MODEL_FROM_DATABASE=KCU105-KU040
+
+pci:v00001D6Cd00001007*
+ ID_MODEL_FROM_DATABASE=XUSP3S-VU095 [Jasper]
+
+pci:v00001D6Cd00004200*
+ ID_MODEL_FROM_DATABASE=A5PL-E1-10GETI [10 GbE Ethernet Traffic Instrument]
+
 pci:v00001DE1*
  ID_VENDOR_FROM_DATABASE=Tekram Technology Co.,Ltd.
 
 pci:v00001DE1d00000391*
- ID_MODEL_FROM_DATABASE=TRM-S1040
+ ID_MODEL_FROM_DATABASE=TRM-S1040 [DC-315 / DC-395 series]
 
 pci:v00001DE1d00002020*
  ID_MODEL_FROM_DATABASE=DC-390
@@ -60267,16 +60372,16 @@ pci:v00008086d00000C4E*
  ID_MODEL_FROM_DATABASE=Atom Processor S1200 NTB Primary
 
 pci:v00008086d00000C50*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family QuickData Technology Device
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon QuickData Technology Device
 
 pci:v00008086d00000C51*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family QuickData Technology Device
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon QuickData Technology Device
 
 pci:v00008086d00000C52*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family QuickData Technology Device
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon QuickData Technology Device
 
 pci:v00008086d00000C53*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family QuickData Technology Device
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon QuickData Technology Device
 
 pci:v00008086d00000C54*
  ID_MODEL_FROM_DATABASE=Atom Processor S1200 Internal
@@ -63456,10 +63561,13 @@ pci:v00008086d00001572sv00001137sd0000013B*
  ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+ (Ethernet Converged NIC X710-4)
 
 pci:v00008086d00001572sv000017AAsd00000000*
- ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+ (ThinkServer XL710 AnyFabric)
+ ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+ (ThinkServer X710 AnyFabric for 10GbE SFP+)
 
 pci:v00008086d00001572sv000017AAsd00004001*
- ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+ (ThinkServer XL710-4 AnyFabric)
+ ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+ (ThinkServer X710-4 AnyFabric for 10GbE SFP+)
+
+pci:v00008086d00001572sv000017AAsd00004002*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+ (ThinkServer X710-2 AnyFabric for 10GbE SFP+)
 
 pci:v00008086d00001572sv00008086sd00000000*
  ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+ (Ethernet Converged Network Adapter X710)
@@ -72072,481 +72180,481 @@ pci:v00008086d00002E96*
  ID_MODEL_FROM_DATABASE=4 Series Chipset PT IDER Controller
 
 pci:v00008086d00002F00*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 DMI2
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 DMI2
 
 pci:v00008086d00002F01*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 PCI Express Root Port 0
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 PCI Express Root Port 0
 
 pci:v00008086d00002F02*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 PCI Express Root Port 1
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 PCI Express Root Port 1
 
 pci:v00008086d00002F03*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 PCI Express Root Port 1
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 PCI Express Root Port 1
 
 pci:v00008086d00002F04*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 PCI Express Root Port 2
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 PCI Express Root Port 2
 
 pci:v00008086d00002F05*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 PCI Express Root Port 2
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 PCI Express Root Port 2
 
 pci:v00008086d00002F06*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 PCI Express Root Port 2
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 PCI Express Root Port 2
 
 pci:v00008086d00002F07*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 PCI Express Root Port 2
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 PCI Express Root Port 2
 
 pci:v00008086d00002F08*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 PCI Express Root Port 3
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 PCI Express Root Port 3
 
 pci:v00008086d00002F09*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 PCI Express Root Port 3
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 PCI Express Root Port 3
 
 pci:v00008086d00002F0A*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 PCI Express Root Port 3
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 PCI Express Root Port 3
 
 pci:v00008086d00002F0B*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 PCI Express Root Port 3
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 PCI Express Root Port 3
 
 pci:v00008086d00002F10*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 IIO Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 IIO Debug
 
 pci:v00008086d00002F11*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 IIO Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 IIO Debug
 
 pci:v00008086d00002F12*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 IIO Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 IIO Debug
 
 pci:v00008086d00002F13*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 IIO Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 IIO Debug
 
 pci:v00008086d00002F14*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 IIO Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 IIO Debug
 
 pci:v00008086d00002F15*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 IIO Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 IIO Debug
 
 pci:v00008086d00002F16*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 IIO Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 IIO Debug
 
 pci:v00008086d00002F17*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 IIO Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 IIO Debug
 
 pci:v00008086d00002F18*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 IIO Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 IIO Debug
 
 pci:v00008086d00002F19*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 IIO Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 IIO Debug
 
 pci:v00008086d00002F1A*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 IIO Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 IIO Debug
 
 pci:v00008086d00002F1B*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 IIO Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 IIO Debug
 
 pci:v00008086d00002F1C*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 IIO Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 IIO Debug
 
 pci:v00008086d00002F1D*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 PCIe Ring Interface
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 PCIe Ring Interface
 
 pci:v00008086d00002F1E*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Scratchpad & Semaphore Registers
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Scratchpad & Semaphore Registers
 
 pci:v00008086d00002F1F*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Scratchpad & Semaphore Registers
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Scratchpad & Semaphore Registers
 
 pci:v00008086d00002F20*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 DMA Channel 0
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 DMA Channel 0
 
 pci:v00008086d00002F21*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 DMA Channel 1
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 DMA Channel 1
 
 pci:v00008086d00002F22*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 DMA Channel 2
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 DMA Channel 2
 
 pci:v00008086d00002F23*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 DMA Channel 3
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 DMA Channel 3
 
 pci:v00008086d00002F24*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 DMA Channel 4
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 DMA Channel 4
 
 pci:v00008086d00002F25*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 DMA Channel 5
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 DMA Channel 5
 
 pci:v00008086d00002F26*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 DMA Channel 6
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 DMA Channel 6
 
 pci:v00008086d00002F27*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 DMA Channel 7
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 DMA Channel 7
 
 pci:v00008086d00002F28*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Address Map, VTd_Misc, System Management
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Address Map, VTd_Misc, System Management
 
 pci:v00008086d00002F29*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Hot Plug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Hot Plug
 
 pci:v00008086d00002F2A*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 RAS, Control Status and Global Errors
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 RAS, Control Status and Global Errors
 
 pci:v00008086d00002F2C*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 I/O APIC
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 I/O APIC
 
 pci:v00008086d00002F2E*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 RAID 5/6
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 RAID 5/6
 
 pci:v00008086d00002F2F*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 RAID 5/6
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 RAID 5/6
 
 pci:v00008086d00002F30*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Home Agent 0
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Home Agent 0
 
 pci:v00008086d00002F32*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 QPI Link 0
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 0
 
 pci:v00008086d00002F33*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 QPI Link 1
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 1
 
 pci:v00008086d00002F34*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 PCIe Ring Interface
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 PCIe Ring Interface
 
 pci:v00008086d00002F36*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 R3 QPI Link 0 & 1 Monitoring
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 R3 QPI Link 0 & 1 Monitoring
 
 pci:v00008086d00002F37*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 R3 QPI Link 0 & 1 Monitoring
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 R3 QPI Link 0 & 1 Monitoring
 
 pci:v00008086d00002F38*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Home Agent 1
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Home Agent 1
 
 pci:v00008086d00002F39*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 I/O Performance Monitoring
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 I/O Performance Monitoring
 
 pci:v00008086d00002F3A*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 QPI Link 2
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 2
 
 pci:v00008086d00002F3E*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 R3 QPI Link 2 Monitoring
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 R3 QPI Link 2 Monitoring
 
 pci:v00008086d00002F3F*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 R3 QPI Link 2 Monitoring
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 R3 QPI Link 2 Monitoring
 
 pci:v00008086d00002F40*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 QPI Link 2
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 2
 
 pci:v00008086d00002F41*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 R3 QPI Link 2 Monitoring
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 R3 QPI Link 2 Monitoring
 
 pci:v00008086d00002F43*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 QPI Link 2
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 2
 
 pci:v00008086d00002F45*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 QPI Link 2 Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 2 Debug
 
 pci:v00008086d00002F46*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 QPI Link 2 Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 2 Debug
 
 pci:v00008086d00002F47*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 QPI Link 2 Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 2 Debug
 
 pci:v00008086d00002F60*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Home Agent 1
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Home Agent 1
 
 pci:v00008086d00002F68*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Integrated Memory Controller 1 Target Address, Thermal & RAS Registers
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 1 Target Address, Thermal & RAS Registers
 
 pci:v00008086d00002F6A*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel Target Address Decoder
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel Target Address Decoder
 
 pci:v00008086d00002F6B*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel Target Address Decoder
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel Target Address Decoder
 
 pci:v00008086d00002F6C*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel Target Address Decoder
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel Target Address Decoder
 
 pci:v00008086d00002F6D*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel Target Address Decoder
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel Target Address Decoder
 
 pci:v00008086d00002F6E*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 DDRIO Channel 2/3 Broadcast
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 DDRIO Channel 2/3 Broadcast
 
 pci:v00008086d00002F6F*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 DDRIO Global Broadcast
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 DDRIO Global Broadcast
 
 pci:v00008086d00002F70*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Home Agent 0 Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Home Agent 0 Debug
 
 pci:v00008086d00002F71*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Integrated Memory Controller 0 Target Address, Thermal & RAS Registers
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 0 Target Address, Thermal & RAS Registers
 
 pci:v00008086d00002F76*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 E3 QPI Link Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 E3 QPI Link Debug
 
 pci:v00008086d00002F78*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Home Agent 1 Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Home Agent 1 Debug
 
 pci:v00008086d00002F79*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Integrated Memory Controller 1 Target Address, Thermal & RAS Registers
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 1 Target Address, Thermal & RAS Registers
 
 pci:v00008086d00002F7D*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Scratchpad & Semaphore Registers
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Scratchpad & Semaphore Registers
 
 pci:v00008086d00002F7E*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 E3 QPI Link Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 E3 QPI Link Debug
 
 pci:v00008086d00002F80*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 QPI Link 0
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 0
 
 pci:v00008086d00002F81*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 R3 QPI Link 0 & 1 Monitoring
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 R3 QPI Link 0 & 1 Monitoring
 
 pci:v00008086d00002F83*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 QPI Link 0
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 0
 
 pci:v00008086d00002F85*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 QPI Link 0 Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 0 Debug
 
 pci:v00008086d00002F86*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 QPI Link 0 Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 0 Debug
 
 pci:v00008086d00002F87*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 QPI Link 0 Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 0 Debug
 
 pci:v00008086d00002F88*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 VCU
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 VCU
 
 pci:v00008086d00002F8A*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 VCU
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 VCU
 
 pci:v00008086d00002F90*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 QPI Link 1
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 1
 
 pci:v00008086d00002F93*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 QPI Link 1
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 1
 
 pci:v00008086d00002F95*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 QPI Link 1 Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 1 Debug
 
 pci:v00008086d00002F96*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 QPI Link 1 Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 1 Debug
 
 pci:v00008086d00002F98*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Power Control Unit
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Power Control Unit
 
 pci:v00008086d00002F99*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Power Control Unit
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Power Control Unit
 
 pci:v00008086d00002F9A*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Power Control Unit
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Power Control Unit
 
 pci:v00008086d00002F9C*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Power Control Unit
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Power Control Unit
 
 pci:v00008086d00002FA0*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Home Agent 0
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Home Agent 0
 
 pci:v00008086d00002FA8*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Integrated Memory Controller 0 Target Address, Thermal & RAS Registers
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 0 Target Address, Thermal & RAS Registers
 
 pci:v00008086d00002FAA*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel Target Address Decoder
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel Target Address Decoder
 
 pci:v00008086d00002FAB*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel Target Address Decoder
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel Target Address Decoder
 
 pci:v00008086d00002FAC*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel Target Address Decoder
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel Target Address Decoder
 
 pci:v00008086d00002FAD*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel Target Address Decoder
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel Target Address Decoder
 
 pci:v00008086d00002FAE*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 DDRIO Channel 0/1 Broadcast
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 DDRIO Channel 0/1 Broadcast
 
 pci:v00008086d00002FAF*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 DDRIO Global Broadcast
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 DDRIO Global Broadcast
 
 pci:v00008086d00002FB0*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 0 Thermal Control
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 0 Thermal Control
 
 pci:v00008086d00002FB1*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 1 Thermal Control
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 1 Thermal Control
 
 pci:v00008086d00002FB2*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 0 ERROR Registers
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 0 ERROR Registers
 
 pci:v00008086d00002FB3*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 1 ERROR Registers
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 1 ERROR Registers
 
 pci:v00008086d00002FB4*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 2 Thermal Control
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 2 Thermal Control
 
 pci:v00008086d00002FB5*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 3 Thermal Control
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 3 Thermal Control
 
 pci:v00008086d00002FB6*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 2 ERROR Registers
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 2 ERROR Registers
 
 pci:v00008086d00002FB7*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 3 ERROR Registers
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 3 ERROR Registers
 
 pci:v00008086d00002FB8*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 DDRIO (VMSE) 2 & 3
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 DDRIO (VMSE) 2 & 3
 
 pci:v00008086d00002FB9*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 DDRIO (VMSE) 2 & 3
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 DDRIO (VMSE) 2 & 3
 
 pci:v00008086d00002FBA*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 DDRIO (VMSE) 2 & 3
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 DDRIO (VMSE) 2 & 3
 
 pci:v00008086d00002FBB*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 DDRIO (VMSE) 2 & 3
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 DDRIO (VMSE) 2 & 3
 
 pci:v00008086d00002FBC*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 DDRIO (VMSE) 0 & 1
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 DDRIO (VMSE) 0 & 1
 
 pci:v00008086d00002FBD*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 DDRIO (VMSE) 0 & 1
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 DDRIO (VMSE) 0 & 1
 
 pci:v00008086d00002FBE*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 DDRIO (VMSE) 0 & 1
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 DDRIO (VMSE) 0 & 1
 
 pci:v00008086d00002FBF*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 DDRIO (VMSE) 0 & 1
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 DDRIO (VMSE) 0 & 1
 
 pci:v00008086d00002FC0*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Power Control Unit
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Power Control Unit
 
 pci:v00008086d00002FC1*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Power Control Unit
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Power Control Unit
 
 pci:v00008086d00002FC2*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Power Control Unit
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Power Control Unit
 
 pci:v00008086d00002FC3*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Power Control Unit
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Power Control Unit
 
 pci:v00008086d00002FC4*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Power Control Unit
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Power Control Unit
 
 pci:v00008086d00002FC5*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Power Control Unit
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Power Control Unit
 
 pci:v00008086d00002FD0*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 0 Thermal Control
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 0 Thermal Control
 
 pci:v00008086d00002FD1*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 1 Thermal Control
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 1 Thermal Control
 
 pci:v00008086d00002FD2*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 0 ERROR Registers
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 0 ERROR Registers
 
 pci:v00008086d00002FD3*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 1 ERROR Registers
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 1 ERROR Registers
 
 pci:v00008086d00002FD4*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 2 Thermal Control
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 2 Thermal Control
 
 pci:v00008086d00002FD5*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 3 Thermal Control
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 3 Thermal Control
 
 pci:v00008086d00002FD6*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 2 ERROR Registers
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 2 ERROR Registers
 
 pci:v00008086d00002FD7*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 3 ERROR Registers
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 3 ERROR Registers
 
 pci:v00008086d00002FE0*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Unicast Registers
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
 
 pci:v00008086d00002FE1*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Unicast Registers
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
 
 pci:v00008086d00002FE2*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Unicast Registers
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
 
 pci:v00008086d00002FE3*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Unicast Registers
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
 
 pci:v00008086d00002FE4*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Unicast Registers
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
 
 pci:v00008086d00002FE5*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Unicast Registers
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
 
 pci:v00008086d00002FE6*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Unicast Registers
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
 
 pci:v00008086d00002FE7*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Unicast Registers
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
 
 pci:v00008086d00002FE8*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Unicast Registers
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
 
 pci:v00008086d00002FE9*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Unicast Registers
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
 
 pci:v00008086d00002FEA*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Unicast Registers
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
 
 pci:v00008086d00002FEB*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Unicast Registers
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
 
 pci:v00008086d00002FEC*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Unicast Registers
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
 
 pci:v00008086d00002FED*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Unicast Registers
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
 
 pci:v00008086d00002FEE*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Unicast Registers
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
 
 pci:v00008086d00002FEF*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Unicast Registers
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
 
 pci:v00008086d00002FF0*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Unicast Registers
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
 
 pci:v00008086d00002FF1*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Unicast Registers
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
 
 pci:v00008086d00002FF2*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Unicast Registers
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
 
 pci:v00008086d00002FF3*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Unicast Registers
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
 
 pci:v00008086d00002FF4*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Unicast Registers
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
 
 pci:v00008086d00002FF5*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Unicast Registers
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
 
 pci:v00008086d00002FF6*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Unicast Registers
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
 
 pci:v00008086d00002FF7*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Unicast Registers
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
 
 pci:v00008086d00002FF8*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Buffered Ring Agent
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Buffered Ring Agent
 
 pci:v00008086d00002FF9*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Buffered Ring Agent
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Buffered Ring Agent
 
 pci:v00008086d00002FFA*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Buffered Ring Agent
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Buffered Ring Agent
 
 pci:v00008086d00002FFB*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 Buffered Ring Agent
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 Buffered Ring Agent
 
 pci:v00008086d00002FFC*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 System Address Decoder & Broadcast Registers
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 System Address Decoder & Broadcast Registers
 
 pci:v00008086d00002FFD*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 System Address Decoder & Broadcast Registers
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 System Address Decoder & Broadcast Registers
 
 pci:v00008086d00002FFE*
- ID_MODEL_FROM_DATABASE=Xeon E5 v3/Core i7 System Address Decoder & Broadcast Registers
+ ID_MODEL_FROM_DATABASE=Xeon E7 v3/Xeon E5 v3/Core i7 System Address Decoder & Broadcast Registers
 
 pci:v00008086d00003165*
  ID_MODEL_FROM_DATABASE=Wireless 3165
@@ -74982,487 +75090,487 @@ pci:v00008086d000065FF*
  ID_MODEL_FROM_DATABASE=5100 Chipset DMA Engine
 
 pci:v00008086d00006F00*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family DMI2
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon DMI2
 
 pci:v00008086d00006F01*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family PCI Express Root Port 0
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon PCI Express Root Port 0
 
 pci:v00008086d00006F02*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family PCI Express Root Port 1
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon PCI Express Root Port 1
 
 pci:v00008086d00006F03*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family PCI Express Root Port 1
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon PCI Express Root Port 1
 
 pci:v00008086d00006F04*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family PCI Express Root Port 2
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon PCI Express Root Port 2
 
 pci:v00008086d00006F05*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family PCI Express Root Port 2
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon PCI Express Root Port 2
 
 pci:v00008086d00006F06*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family PCI Express Root Port 2
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon PCI Express Root Port 2
 
 pci:v00008086d00006F07*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family PCI Express Root Port 2
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon PCI Express Root Port 2
 
 pci:v00008086d00006F08*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family PCI Express Root Port 3
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon PCI Express Root Port 3
 
 pci:v00008086d00006F09*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family PCI Express Root Port 3
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon PCI Express Root Port 3
 
 pci:v00008086d00006F0A*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family PCI Express Root Port 3
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon PCI Express Root Port 3
 
 pci:v00008086d00006F0B*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family PCI Express Root Port 3
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon PCI Express Root Port 3
 
 pci:v00008086d00006F10*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family IIO Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon IIO Debug
 
 pci:v00008086d00006F11*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family IIO Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon IIO Debug
 
 pci:v00008086d00006F12*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family IIO Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon IIO Debug
 
 pci:v00008086d00006F13*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family IIO Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon IIO Debug
 
 pci:v00008086d00006F14*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family IIO Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon IIO Debug
 
 pci:v00008086d00006F15*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family IIO Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon IIO Debug
 
 pci:v00008086d00006F16*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family IIO Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon IIO Debug
 
 pci:v00008086d00006F17*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family IIO Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon IIO Debug
 
 pci:v00008086d00006F18*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family IIO Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon IIO Debug
 
 pci:v00008086d00006F19*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family IIO Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon IIO Debug
 
 pci:v00008086d00006F1A*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family IIO Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon IIO Debug
 
 pci:v00008086d00006F1B*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family IIO Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon IIO Debug
 
 pci:v00008086d00006F1C*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family IIO Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon IIO Debug
 
 pci:v00008086d00006F1D*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family R2PCIe Agent
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon R2PCIe Agent
 
 pci:v00008086d00006F1E*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Ubox
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Ubox
 
 pci:v00008086d00006F1F*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Ubox
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Ubox
 
 pci:v00008086d00006F20*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Crystal Beach DMA Channel 0
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Crystal Beach DMA Channel 0
 
 pci:v00008086d00006F21*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Crystal Beach DMA Channel 1
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Crystal Beach DMA Channel 1
 
 pci:v00008086d00006F22*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Crystal Beach DMA Channel 2
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Crystal Beach DMA Channel 2
 
 pci:v00008086d00006F23*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Crystal Beach DMA Channel 3
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Crystal Beach DMA Channel 3
 
 pci:v00008086d00006F24*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Crystal Beach DMA Channel 4
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Crystal Beach DMA Channel 4
 
 pci:v00008086d00006F25*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Crystal Beach DMA Channel 5
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Crystal Beach DMA Channel 5
 
 pci:v00008086d00006F26*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Crystal Beach DMA Channel 6
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Crystal Beach DMA Channel 6
 
 pci:v00008086d00006F27*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Crystal Beach DMA Channel 7
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Crystal Beach DMA Channel 7
 
 pci:v00008086d00006F28*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Map/VTd_Misc/System Management
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Map/VTd_Misc/System Management
 
 pci:v00008086d00006F29*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family IIO Hot Plug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon IIO Hot Plug
 
 pci:v00008086d00006F2A*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family IIO RAS/Control Status/Global Errors
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon IIO RAS/Control Status/Global Errors
 
 pci:v00008086d00006F2C*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family I/O APIC
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon I/O APIC
 
 pci:v00008086d00006F30*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Home Agent 0
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Home Agent 0
 
 pci:v00008086d00006F32*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family QPI Link 0
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon QPI Link 0
 
 pci:v00008086d00006F33*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family QPI Link 1
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon QPI Link 1
 
 pci:v00008086d00006F34*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family R2PCIe Agent
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon R2PCIe Agent
 
 pci:v00008086d00006F36*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family R3 QPI Link 0/1
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon R3 QPI Link 0/1
 
 pci:v00008086d00006F37*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family R3 QPI Link 0/1
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon R3 QPI Link 0/1
 
 pci:v00008086d00006F38*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Home Agent 1
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Home Agent 1
 
 pci:v00008086d00006F39*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family IO Performance Monitoring
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon IO Performance Monitoring
 
 pci:v00008086d00006F3A*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family QPI Link 2
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon QPI Link 2
 
 pci:v00008086d00006F3E*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family R3 QPI Link 2
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon R3 QPI Link 2
 
 pci:v00008086d00006F3F*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family R3 QPI Link 2
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon R3 QPI Link 2
 
 pci:v00008086d00006F40*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family QPI Link 2
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon QPI Link 2
 
 pci:v00008086d00006F41*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family R3 QPI Link 2
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon R3 QPI Link 2
 
 pci:v00008086d00006F43*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family QPI Link 2
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon QPI Link 2
 
 pci:v00008086d00006F45*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family QPI Link 2 Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon QPI Link 2 Debug
 
 pci:v00008086d00006F46*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family QPI Link 2 Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon QPI Link 2 Debug
 
 pci:v00008086d00006F47*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family QPI Link 2 Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon QPI Link 2 Debug
 
 pci:v00008086d00006F60*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Home Agent 1
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Home Agent 1
 
 pci:v00008086d00006F68*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Target Address/Thermal/RAS
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Target Address/Thermal/RAS
 
 pci:v00008086d00006F6A*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Channel Target Address Decoder
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Channel Target Address Decoder
 
 pci:v00008086d00006F6B*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Channel Target Address Decoder
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Channel Target Address Decoder
 
 pci:v00008086d00006F6C*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Channel Target Address Decoder
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Channel Target Address Decoder
 
 pci:v00008086d00006F6D*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Channel Target Address Decoder
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Channel Target Address Decoder
 
 pci:v00008086d00006F6E*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family DDRIO Channel 2/3 Broadcast
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon DDRIO Channel 2/3 Broadcast
 
 pci:v00008086d00006F6F*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family DDRIO Global Broadcast
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon DDRIO Global Broadcast
 
 pci:v00008086d00006F70*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Home Agent 0 Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Home Agent 0 Debug
 
 pci:v00008086d00006F71*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Memory Controller 0 - Target Address/Thermal/RAS
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Memory Controller 0 - Target Address/Thermal/RAS
 
 pci:v00008086d00006F76*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family R3 QPI Link Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon R3 QPI Link Debug
 
 pci:v00008086d00006F78*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Home Agent 1 Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Home Agent 1 Debug
 
 pci:v00008086d00006F79*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Target Address/Thermal/RAS
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Target Address/Thermal/RAS
 
 pci:v00008086d00006F7D*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Ubox
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Ubox
 
 pci:v00008086d00006F7E*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family R3 QPI Link Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon R3 QPI Link Debug
 
 pci:v00008086d00006F80*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family QPI Link 0
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon QPI Link 0
 
 pci:v00008086d00006F81*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family R3 QPI Link 0/1
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon R3 QPI Link 0/1
 
 pci:v00008086d00006F83*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family QPI Link 0
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon QPI Link 0
 
 pci:v00008086d00006F85*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family QPI Link 0 Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon QPI Link 0 Debug
 
 pci:v00008086d00006F86*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family QPI Link 0 Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon QPI Link 0 Debug
 
 pci:v00008086d00006F87*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family QPI Link 0 Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon QPI Link 0 Debug
 
 pci:v00008086d00006F88*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Power Control Unit
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Power Control Unit
 
 pci:v00008086d00006F8A*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Power Control Unit
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Power Control Unit
 
 pci:v00008086d00006F90*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family QPI Link 1
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon QPI Link 1
 
 pci:v00008086d00006F93*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family QPI Link 1
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon QPI Link 1
 
 pci:v00008086d00006F95*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family QPI Link 1 Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon QPI Link 1 Debug
 
 pci:v00008086d00006F96*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family QPI Link 1 Debug
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon QPI Link 1 Debug
 
 pci:v00008086d00006F98*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Power Control Unit
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Power Control Unit
 
 pci:v00008086d00006F99*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Power Control Unit
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Power Control Unit
 
 pci:v00008086d00006F9A*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Power Control Unit
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Power Control Unit
 
 pci:v00008086d00006F9C*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Power Control Unit
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Power Control Unit
 
 pci:v00008086d00006FA0*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Home Agent 0
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Home Agent 0
 
 pci:v00008086d00006FA8*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Memory Controller 0 - Target Address/Thermal/RAS
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Memory Controller 0 - Target Address/Thermal/RAS
 
 pci:v00008086d00006FAA*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Memory Controller 0 - Channel Target Address Decoder
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Memory Controller 0 - Channel Target Address Decoder
 
 pci:v00008086d00006FAB*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Memory Controller 0 - Channel Target Address Decoder
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Memory Controller 0 - Channel Target Address Decoder
 
 pci:v00008086d00006FAC*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Memory Controller 0 - Channel Target Address Decoder
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Memory Controller 0 - Channel Target Address Decoder
 
 pci:v00008086d00006FAD*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Memory Controller 0 - Channel Target Address Decoder
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Memory Controller 0 - Channel Target Address Decoder
 
 pci:v00008086d00006FAE*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family DDRIO Channel 0/1 Broadcast
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon DDRIO Channel 0/1 Broadcast
 
 pci:v00008086d00006FAF*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family DDRIO Global Broadcast
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon DDRIO Global Broadcast
 
 pci:v00008086d00006FB0*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Memory Controller 0 - Channel 0 Thermal Control
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Memory Controller 0 - Channel 0 Thermal Control
 
 pci:v00008086d00006FB1*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Memory Controller 0 - Channel 1 Thermal Control
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Memory Controller 0 - Channel 1 Thermal Control
 
 pci:v00008086d00006FB2*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Memory Controller 0 - Channel 0 Error
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Memory Controller 0 - Channel 0 Error
 
 pci:v00008086d00006FB3*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Memory Controller 0 - Channel 1 Error
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Memory Controller 0 - Channel 1 Error
 
 pci:v00008086d00006FB4*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Memory Controller 0 - Channel 2 Thermal Control
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Memory Controller 0 - Channel 2 Thermal Control
 
 pci:v00008086d00006FB5*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Memory Controller 0 - Channel 3 Thermal Control
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Memory Controller 0 - Channel 3 Thermal Control
 
 pci:v00008086d00006FB6*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Memory Controller 0 - Channel 2 Error
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Memory Controller 0 - Channel 2 Error
 
 pci:v00008086d00006FB7*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Memory Controller 0 - Channel 3 Error
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Memory Controller 0 - Channel 3 Error
 
 pci:v00008086d00006FB8*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family DDRIO Channel 2/3 Interface
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon DDRIO Channel 2/3 Interface
 
 pci:v00008086d00006FB9*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family DDRIO Channel 2/3 Interface
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon DDRIO Channel 2/3 Interface
 
 pci:v00008086d00006FBA*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family DDRIO Channel 2/3 Interface
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon DDRIO Channel 2/3 Interface
 
 pci:v00008086d00006FBB*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family DDRIO Channel 2/3 Interface
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon DDRIO Channel 2/3 Interface
 
 pci:v00008086d00006FBC*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family DDRIO Channel 0/1 Interface
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon DDRIO Channel 0/1 Interface
 
 pci:v00008086d00006FBD*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family DDRIO Channel 0/1 Interface
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon DDRIO Channel 0/1 Interface
 
 pci:v00008086d00006FBE*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family DDRIO Channel 0/1 Interface
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon DDRIO Channel 0/1 Interface
 
 pci:v00008086d00006FBF*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family DDRIO Channel 0/1 Interface
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon DDRIO Channel 0/1 Interface
 
 pci:v00008086d00006FC0*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Power Control Unit
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Power Control Unit
 
 pci:v00008086d00006FC1*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Power Control Unit
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Power Control Unit
 
 pci:v00008086d00006FC2*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Power Control Unit
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Power Control Unit
 
 pci:v00008086d00006FC3*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Power Control Unit
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Power Control Unit
 
 pci:v00008086d00006FC4*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Power Control Unit
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Power Control Unit
 
 pci:v00008086d00006FC5*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Power Control Unit
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Power Control Unit
 
 pci:v00008086d00006FC6*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Power Control Unit
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Power Control Unit
 
 pci:v00008086d00006FC7*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Power Control Unit
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Power Control Unit
 
 pci:v00008086d00006FC8*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Power Control Unit
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Power Control Unit
 
 pci:v00008086d00006FC9*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Power Control Unit
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Power Control Unit
 
 pci:v00008086d00006FCA*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Power Control Unit
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Power Control Unit
 
 pci:v00008086d00006FCB*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Power Control Unit
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Power Control Unit
 
 pci:v00008086d00006FCC*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Power Control Unit
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Power Control Unit
 
 pci:v00008086d00006FCD*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Power Control Unit
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Power Control Unit
 
 pci:v00008086d00006FCE*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Power Control Unit
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Power Control Unit
 
 pci:v00008086d00006FCF*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Power Control Unit
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Power Control Unit
 
 pci:v00008086d00006FD0*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Memory Controller 1 - Channel 0 Thermal Control
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Memory Controller 1 - Channel 0 Thermal Control
 
 pci:v00008086d00006FD1*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Memory Controller 1 - Channel 1 Thermal Control
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Memory Controller 1 - Channel 1 Thermal Control
 
 pci:v00008086d00006FD2*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Memory Controller 1 - Channel 0 Error
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Memory Controller 1 - Channel 0 Error
 
 pci:v00008086d00006FD3*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Memory Controller 1 - Channel 1 Error
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Memory Controller 1 - Channel 1 Error
 
 pci:v00008086d00006FD4*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Memory Controller 1 - Channel 2 Thermal Control
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Memory Controller 1 - Channel 2 Thermal Control
 
 pci:v00008086d00006FD5*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Memory Controller 1 - Channel 3 Thermal Control
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Memory Controller 1 - Channel 3 Thermal Control
 
 pci:v00008086d00006FD6*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Memory Controller 1 - Channel 2 Error
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Memory Controller 1 - Channel 2 Error
 
 pci:v00008086d00006FD7*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Memory Controller 1 - Channel 3 Error
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Memory Controller 1 - Channel 3 Error
 
 pci:v00008086d00006FE0*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Caching Agent
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Caching Agent
 
 pci:v00008086d00006FE1*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Caching Agent
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Caching Agent
 
 pci:v00008086d00006FE2*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Caching Agent
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Caching Agent
 
 pci:v00008086d00006FE3*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Caching Agent
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Caching Agent
 
 pci:v00008086d00006FE4*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Caching Agent
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Caching Agent
 
 pci:v00008086d00006FE5*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Caching Agent
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Caching Agent
 
 pci:v00008086d00006FE6*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Caching Agent
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Caching Agent
 
 pci:v00008086d00006FE7*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Caching Agent
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Caching Agent
 
 pci:v00008086d00006FE8*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Caching Agent
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Caching Agent
 
 pci:v00008086d00006FE9*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Caching Agent
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Caching Agent
 
 pci:v00008086d00006FEA*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Caching Agent
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Caching Agent
 
 pci:v00008086d00006FEB*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Caching Agent
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Caching Agent
 
 pci:v00008086d00006FEC*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Caching Agent
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Caching Agent
 
 pci:v00008086d00006FED*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Caching Agent
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Caching Agent
 
 pci:v00008086d00006FEE*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Caching Agent
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Caching Agent
 
 pci:v00008086d00006FEF*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Caching Agent
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Caching Agent
 
 pci:v00008086d00006FF0*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Caching Agent
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Caching Agent
 
 pci:v00008086d00006FF1*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Caching Agent
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Caching Agent
 
 pci:v00008086d00006FF8*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Caching Agent
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Caching Agent
 
 pci:v00008086d00006FF9*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Caching Agent
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Caching Agent
 
 pci:v00008086d00006FFA*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Caching Agent
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Caching Agent
 
 pci:v00008086d00006FFB*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Caching Agent
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Caching Agent
 
 pci:v00008086d00006FFC*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Caching Agent
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Caching Agent
 
 pci:v00008086d00006FFD*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Caching Agent
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Caching Agent
 
 pci:v00008086d00006FFE*
- ID_MODEL_FROM_DATABASE=Xeon Processor D Family Caching Agent
+ ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon Caching Agent
 
 pci:v00008086d00007000*
  ID_MODEL_FROM_DATABASE=82371SB PIIX3 ISA [Natoma/Triton II]
@@ -77436,10 +77544,10 @@ pci:v00009004d00005075*
  ID_MODEL_FROM_DATABASE=AIC-755x
 
 pci:v00009004d00005078*
- ID_MODEL_FROM_DATABASE=AIC-7850
+ ID_MODEL_FROM_DATABASE=AIC-7850T/7856T [AVA-2902/4/6 / AHA-2910]
 
 pci:v00009004d00005078sv00009004sd00007850*
- ID_MODEL_FROM_DATABASE=AIC-7850 (AHA-2904/Integrated AIC-7850)
+ ID_MODEL_FROM_DATABASE=AIC-7850T/7856T [AVA-2902/4/6 / AHA-2910] (AIC-7850T/7856T [AVA-290x / AHA-2910])
 
 pci:v00009004d00005175*
  ID_MODEL_FROM_DATABASE=AIC-755x
@@ -77586,7 +77694,7 @@ pci:v00009004d00007078*
  ID_MODEL_FROM_DATABASE=AHA-294x / AIC-7870
 
 pci:v00009004d00007178*
- ID_MODEL_FROM_DATABASE=AHA-2940/2940W / AIC-7871
+ ID_MODEL_FROM_DATABASE=AIC-7870P/7871 [AHA-2940/W/S76]
 
 pci:v00009004d00007278*
  ID_MODEL_FROM_DATABASE=AHA-3940/3940W / AIC-7872
@@ -77703,10 +77811,10 @@ pci:v00009004d00008078sv00009004sd00007880*
  ID_MODEL_FROM_DATABASE=AIC-7880U (AIC-7880P Ultra/Ultra Wide SCSI Chipset)
 
 pci:v00009004d00008178*
- ID_MODEL_FROM_DATABASE=AHA-2940U/UW/D / AIC-7881U
+ ID_MODEL_FROM_DATABASE=AIC-7870P/7881U [AHA-2940U/UW/D/S76]
 
 pci:v00009004d00008178sv00009004sd00007881*
- ID_MODEL_FROM_DATABASE=AHA-2940U/UW/D / AIC-7881U (AHA-2940UW SCSI Host Adapter)
+ ID_MODEL_FROM_DATABASE=AIC-7870P/7881U [AHA-2940U/UW/D/S76] (AHA-2940UW SCSI Host Adapter)
 
 pci:v00009004d00008278*
  ID_MODEL_FROM_DATABASE=AHA-3940U/UW/UWD / AIC-7882U
@@ -77757,7 +77865,7 @@ pci:v00009005d00000010sv00009005sd0000A100*
  ID_MODEL_FROM_DATABASE=AHA-2940U2/U2W (AHA-2940U2B SCSI Controller)
 
 pci:v00009005d00000010sv00009005sd0000A180*
- ID_MODEL_FROM_DATABASE=AHA-2940U2/U2W (AHA-2940U2W SCSI Controller)
+ ID_MODEL_FROM_DATABASE=AHA-2940U2/U2W (AIC-3860Q [AHA-2940U2W/GE] SCSI Controller)
 
 pci:v00009005d00000010sv00009005sd0000E100*
  ID_MODEL_FROM_DATABASE=AHA-2940U2/U2W (AHA-2950U2B SCSI Controller)
diff --git a/hwdb/20-usb-vendor-model.hwdb b/hwdb/20-usb-vendor-model.hwdb
index 4d61dd7..151ba5c 100644
--- a/hwdb/20-usb-vendor-model.hwdb
+++ b/hwdb/20-usb-vendor-model.hwdb
@@ -470,6 +470,9 @@ usb:v03F0p0121*
 usb:v03F0p0122*
  ID_MODEL_FROM_DATABASE=HID Internet Keyboard
 
+usb:v03F0p0125*
+ ID_MODEL_FROM_DATABASE=DAT72 Tape
+
 usb:v03F0p0139*
  ID_MODEL_FROM_DATABASE=Barcode Scanner 4430
 
@@ -767,6 +770,9 @@ usb:v03F0p1211*
 usb:v03F0p1217*
  ID_MODEL_FROM_DATABASE=LaserJet 2300L
 
+usb:v03F0p1227*
+ ID_MODEL_FROM_DATABASE=Virtual CD-ROM
+
 usb:v03F0p1302*
  ID_MODEL_FROM_DATABASE=PhotoSmart 370 series
 
@@ -2060,6 +2066,9 @@ usb:v0402p5636*
 usb:v0402p5637*
  ID_MODEL_FROM_DATABASE=M5637 IDE Controller
 
+usb:v0402p5642*
+ ID_MODEL_FROM_DATABASE=Storage Device
+
 usb:v0402p5661*
  ID_MODEL_FROM_DATABASE=M5661 MP3 player
 
@@ -3884,6 +3893,9 @@ usb:v041Ep4087*
 usb:v041Ep4088*
  ID_MODEL_FROM_DATABASE=Live! Cam Chat HD [VF0700]
 
+usb:v041Ep4095*
+ ID_MODEL_FROM_DATABASE=Live! Cam Sync HD [VF0770]
+
 usb:v041Ep4100*
  ID_MODEL_FROM_DATABASE=Nomad Jukebox 2
 
@@ -8999,6 +9011,9 @@ usb:v0483p3747*
 usb:v0483p3748*
  ID_MODEL_FROM_DATABASE=ST-LINK/V2
 
+usb:v0483p374B*
+ ID_MODEL_FROM_DATABASE=ST-LINK/V2.1 (Nucleo-F103RB)
+
 usb:v0483p4810*
  ID_MODEL_FROM_DATABASE=ISDN adapter
 
@@ -9326,6 +9341,9 @@ usb:v0499p103C*
 usb:v0499p1054*
  ID_MODEL_FROM_DATABASE=S90XS Keyboard/Music Synthesizer
 
+usb:v0499p160F*
+ ID_MODEL_FROM_DATABASE=P-105
+
 usb:v0499p2000*
  ID_MODEL_FROM_DATABASE=DGP-7
 
@@ -10226,6 +10244,9 @@ usb:v04A9p1729*
 usb:v04A9p172B*
  ID_MODEL_FROM_DATABASE=MP140 ser
 
+usb:v04A9p1736*
+ ID_MODEL_FROM_DATABASE=PIXMA MX320 series
+
 usb:v04A9p173B*
  ID_MODEL_FROM_DATABASE=PIXMA MP270 All-In-One Printer
 
@@ -10241,6 +10262,9 @@ usb:v04A9p1748*
 usb:v04A9p174D*
  ID_MODEL_FROM_DATABASE=MX360 ser
 
+usb:v04A9p176D*
+ ID_MODEL_FROM_DATABASE=PIXMA MG2550
+
 usb:v04A9p1900*
  ID_MODEL_FROM_DATABASE=CanoScan LiDE 90
 
@@ -12866,12 +12890,18 @@ usb:v04CAp1766*
 usb:v04CAp2004*
  ID_MODEL_FROM_DATABASE=Bluetooth 4.0 [Broadcom BCM20702A0]
 
+usb:v04CAp2006*
+ ID_MODEL_FROM_DATABASE=Broadcom BCM43142A0 Bluetooth Device
+
 usb:v04CAp300B*
  ID_MODEL_FROM_DATABASE=Atheros AR3012 Bluetooth
 
 usb:v04CAp300D*
  ID_MODEL_FROM_DATABASE=Atheros AR3012 Bluetooth
 
+usb:v04CAp300F*
+ ID_MODEL_FROM_DATABASE=Atheros AR3012 Bluetooth
+
 usb:v04CAp7025*
  ID_MODEL_FROM_DATABASE=HP HD Webcam
 
@@ -13361,6 +13391,9 @@ usb:v04D8pFC1E*
 usb:v04D8pFC92*
  ID_MODEL_FROM_DATABASE=Open Bench Logic Sniffer
 
+usb:v04D8pFFEE*
+ ID_MODEL_FROM_DATABASE=Devantech USB-ISS
+
 usb:v04D8pFFEF*
  ID_MODEL_FROM_DATABASE=PICoPLC [APStech]
 
@@ -14390,6 +14423,9 @@ usb:v04E8p60C4*
 usb:v04E8p6124*
  ID_MODEL_FROM_DATABASE=D3 Station External Hard Drive
 
+usb:v04E8p6125*
+ ID_MODEL_FROM_DATABASE=D3 Station External Hard Drive
+
 usb:v04E8p61B6*
  ID_MODEL_FROM_DATABASE=M3 Portable Hard Drive 1TB
 
@@ -15524,6 +15560,9 @@ usb:v04F9p0248*
 usb:v04F9p0273*
  ID_MODEL_FROM_DATABASE=DCP-7057 scanner/printer
 
+usb:v04F9p029F*
+ ID_MODEL_FROM_DATABASE=MFC-9325CW Multifunction Printer
+
 usb:v04F9p02B3*
  ID_MODEL_FROM_DATABASE=MFC J4510DW
 
@@ -16332,7 +16371,7 @@ usb:v0529*
  ID_VENDOR_FROM_DATABASE=Aladdin Knowledge Systems
 
 usb:v0529p0001*
- ID_MODEL_FROM_DATABASE=HASP v0.06
+ ID_MODEL_FROM_DATABASE=HASP copy protection dongle
 
 usb:v0529p030B*
  ID_MODEL_FROM_DATABASE=eToken R1 v3.1.3.x
@@ -17264,6 +17303,9 @@ usb:v0550p000B*
 usb:v0550p014E*
  ID_MODEL_FROM_DATABASE=CM215b Printer
 
+usb:v0550p0165*
+ ID_MODEL_FROM_DATABASE=DocuPrint M215b
+
 usb:v0551*
  ID_VENDOR_FROM_DATABASE=CompuTrend Systems, Inc.
 
@@ -18455,6 +18497,9 @@ usb:v057Cp8403*
 usb:v057Cp84FF*
  ID_MODEL_FROM_DATABASE=AVM Fritz!WLAN USB N (in CD-ROM-mode)
 
+usb:v057Cp8501*
+ ID_MODEL_FROM_DATABASE=FRITZ WLAN N v2 [RT5572/rt2870.bin]
+
 usb:v057D*
  ID_VENDOR_FROM_DATABASE=Shark Multimedia, Inc.
 
@@ -19820,6 +19865,9 @@ usb:v059Fp1052*
 usb:v059Fp1064*
  ID_MODEL_FROM_DATABASE=Rugged 16 and 32 GB
 
+usb:v059Fp106E*
+ ID_MODEL_FROM_DATABASE=Porsche Design Desktop Drive
+
 usb:v059FpA601*
  ID_MODEL_FROM_DATABASE=HardDrive
 
@@ -20702,6 +20750,9 @@ usb:v05C6p6503*
 usb:v05C6p6613*
  ID_MODEL_FROM_DATABASE=Onda H600/N501HS ZTE MF330
 
+usb:v05C6p6764*
+ ID_MODEL_FROM_DATABASE=A0001 Phone [OnePlus One]
+
 usb:v05C6p9000*
  ID_MODEL_FROM_DATABASE=SIMCom SIM5218 modem
 
@@ -22664,6 +22715,9 @@ usb:v064E*
 usb:v064Ep2100*
  ID_MODEL_FROM_DATABASE=Sony Visual Communication Camera
 
+usb:v064Ep9700*
+ ID_MODEL_FROM_DATABASE=Asus Integrated Webcam
+
 usb:v064EpA100*
  ID_MODEL_FROM_DATABASE=Acer OrbiCam
 
@@ -26288,6 +26342,9 @@ usb:v0781p5571*
 usb:v0781p5576*
  ID_MODEL_FROM_DATABASE=Cruzer Facet
 
+usb:v0781p557D*
+ ID_MODEL_FROM_DATABASE=Cruzer Force (64GB)
+
 usb:v0781p5580*
  ID_MODEL_FROM_DATABASE=SDCZ80 Flash Drive
 
@@ -29213,6 +29270,12 @@ usb:v08A9p0014*
 usb:v08A9p0015*
  ID_MODEL_FROM_DATABASE=USBee DX
 
+usb:v08AC*
+ ID_VENDOR_FROM_DATABASE=Macraigor Systems LLC
+
+usb:v08ACp2024*
+ ID_MODEL_FROM_DATABASE=usbWiggler
+
 usb:v08AE*
  ID_VENDOR_FROM_DATABASE=Macally (Mace Group, Inc.)
 
@@ -30095,6 +30158,12 @@ usb:v0908p01F4*
 usb:v0908p01FE*
  ID_MODEL_FROM_DATABASE=SIMATIC NET PC Adapter A2
 
+usb:v0908p04B1*
+ ID_MODEL_FROM_DATABASE=MediSET
+
+usb:v0908p04B2*
+ ID_MODEL_FROM_DATABASE=NC interface
+
 usb:v0908p2701*
  ID_MODEL_FROM_DATABASE=ShenZhen SANZHAI Technology Co.,Ltd Spy Pen VGA
 
@@ -31016,6 +31085,9 @@ usb:v0951p1607*
 usb:v0951p160D*
  ID_MODEL_FROM_DATABASE=DataTraveler Vault Privacy
 
+usb:v0951p160E*
+ ID_MODEL_FROM_DATABASE=DT110P/1GB Capless
+
 usb:v0951p1613*
  ID_MODEL_FROM_DATABASE=DataTraveler DT101C Flash Drive
 
@@ -32306,6 +32378,9 @@ usb:v0A5Cp2154*
 usb:v0A5Cp216C*
  ID_MODEL_FROM_DATABASE=BCM43142A0 Bluetooth Device
 
+usb:v0A5Cp216F*
+ ID_MODEL_FROM_DATABASE=BCM20702A0 Bluetooth
+
 usb:v0A5Cp217D*
  ID_MODEL_FROM_DATABASE=HP Bluethunder
 
@@ -32381,6 +32456,9 @@ usb:v0A5Cp5802*
 usb:v0A5Cp5803*
  ID_MODEL_FROM_DATABASE=BCM5880 Secure Applications Processor with secure keyboard
 
+usb:v0A5Cp5804*
+ ID_MODEL_FROM_DATABASE=BCM5880 Secure Applications Processor with fingerprint swipe sensor
+
 usb:v0A5Cp6300*
  ID_MODEL_FROM_DATABASE=Pirelli Remote NDIS Device
 
@@ -36800,6 +36878,9 @@ usb:v0CF2p6220*
 usb:v0CF2p6225*
  ID_MODEL_FROM_DATABASE=SD card reader (UB6225)
 
+usb:v0CF2p6230*
+ ID_MODEL_FROM_DATABASE=SD Card Reader (UB623X)
+
 usb:v0CF2p6250*
  ID_MODEL_FROM_DATABASE=SD card reader (UB6250)
 
@@ -37217,6 +37298,9 @@ usb:v0D62p0003*
 usb:v0D62p0004*
  ID_MODEL_FROM_DATABASE=Keyboard
 
+usb:v0D62p001B*
+ ID_MODEL_FROM_DATABASE=Keyboard
+
 usb:v0D62p001C*
  ID_MODEL_FROM_DATABASE=Benq X120 Internet Keyboard Pro
 
@@ -37478,6 +37562,9 @@ usb:v0D8Cp010F*
 usb:v0D8Cp0115*
  ID_MODEL_FROM_DATABASE=CM108 Audio Controller
 
+usb:v0D8Cp0139*
+ ID_MODEL_FROM_DATABASE=Multimedia Headset [Gigaware by Ignition L.P.]
+
 usb:v0D8Cp013C*
  ID_MODEL_FROM_DATABASE=CM108 Audio Controller
 
@@ -37892,6 +37979,9 @@ usb:v0DB5p013A*
 usb:v0DB5p013B*
  ID_MODEL_FROM_DATABASE=LSR116 HID
 
+usb:v0DB5p0160*
+ ID_MODEL_FROM_DATABASE=NFC and Smartcard Module (NSM)
+
 usb:v0DB7*
  ID_VENDOR_FROM_DATABASE=ELCON Systemtechnik
 
@@ -38426,6 +38516,9 @@ usb:v0E20*
 usb:v0E20p0101*
  ID_MODEL_FROM_DATABASE=NoteTaker
 
+usb:v0E20p0200*
+ ID_MODEL_FROM_DATABASE=Seiko Instruments InkLink Handwriting System
+
 usb:v0E21*
  ID_VENDOR_FROM_DATABASE=Cowon Systems, Inc.
 
@@ -39323,6 +39416,9 @@ usb:v0F39*
 usb:v0F39p0876*
  ID_MODEL_FROM_DATABASE=Keyboard [87 Francium Pro]
 
+usb:v0F39p1086*
+ ID_MODEL_FROM_DATABASE=DK2108SZ Keyboard [Ducky Zero]
+
 usb:v0F3D*
  ID_VENDOR_FROM_DATABASE=Airprime, Incorporated
 
@@ -40149,7 +40245,7 @@ usb:v1004p61FE*
  ID_MODEL_FROM_DATABASE=Optimus Android Phone [USB tethering mode]
 
 usb:v1004p6300*
- ID_MODEL_FROM_DATABASE=Optimus Android Phone
+ ID_MODEL_FROM_DATABASE=G2/Optimus Android Phone
 
 usb:v1004p631C*
  ID_MODEL_FROM_DATABASE=G2/Optimus Android Phone [MTP mode]
@@ -40163,6 +40259,12 @@ usb:v1004p631E*
 usb:v1004p631F*
  ID_MODEL_FROM_DATABASE=Optimus Android Phone (Charge Mode)
 
+usb:v1004p633E*
+ ID_MODEL_FROM_DATABASE=G2 Android Phone [MTP mode]
+
+usb:v1004p6344*
+ ID_MODEL_FROM_DATABASE=G2 Android Phone [tethering mode]
+
 usb:v1004p6356*
  ID_MODEL_FROM_DATABASE=Optimus Android Phone [Virtual CD mode]
 
@@ -44880,7 +44982,7 @@ usb:v152Dp3562*
  ID_MODEL_FROM_DATABASE=JMS567 SATA 6.0Gb/s bridge
 
 usb:v152Dp3569*
- ID_MODEL_FROM_DATABASE=ATA/ATAPI Bridge [AdPlus SuperVer]
+ ID_MODEL_FROM_DATABASE=JMS566 SATA 3Gb/s bridge
 
 usb:v152E*
  ID_VENDOR_FROM_DATABASE=LG (HLDS)
@@ -46031,6 +46133,9 @@ usb:v1687p5289*
 usb:v1687p6211*
  ID_MODEL_FROM_DATABASE=FlashDisk
 
+usb:v1687p6213*
+ ID_MODEL_FROM_DATABASE=FlashDisk
+
 usb:v1688*
  ID_VENDOR_FROM_DATABASE=Saab AB
 
@@ -49040,6 +49145,9 @@ usb:v1BCE*
 usb:v1BCF*
  ID_VENDOR_FROM_DATABASE=Sunplus Innovation Technology Inc.
 
+usb:v1BCFp0005*
+ ID_MODEL_FROM_DATABASE=Optical Mouse
+
 usb:v1BCFp0007*
  ID_MODEL_FROM_DATABASE=Optical Mouse
 
@@ -49055,12 +49163,30 @@ usb:v1BCFp05CF*
 usb:v1BCFp0C31*
  ID_MODEL_FROM_DATABASE=SPIF30x Serial-ATA bridge
 
+usb:v1BCFp2880*
+ ID_MODEL_FROM_DATABASE=Dell HD Webcam
+
 usb:v1BCFp2885*
  ID_MODEL_FROM_DATABASE=ASUS Webcam
 
 usb:v1BCFp2888*
  ID_MODEL_FROM_DATABASE=HP Universal Camera
 
+usb:v1BCFp28A2*
+ ID_MODEL_FROM_DATABASE=Dell Integrated Webcam
+
+usb:v1BCFp28A6*
+ ID_MODEL_FROM_DATABASE=DELL XPS Integrated Webcam
+
+usb:v1BCFp28AE*
+ ID_MODEL_FROM_DATABASE=Laptop Integrated Webcam HD
+
+usb:v1BCFp28BD*
+ ID_MODEL_FROM_DATABASE=Dell Integrated HD Webcam
+
+usb:v1BCFp2985*
+ ID_MODEL_FROM_DATABASE=Laptop Integrated Webcam HD
+
 usb:v1BCFp2B83*
  ID_MODEL_FROM_DATABASE=Laptop Integrated Webcam FHD
 
@@ -49868,6 +49994,9 @@ usb:v1F4D*
 usb:v1F4DpB803*
  ID_MODEL_FROM_DATABASE=Lifeview LV5TDLX DVB-T [RTL2832U]
 
+usb:v1F4DpD220*
+ ID_MODEL_FROM_DATABASE=Geniatech T220 DVB-T2 TV Stick
+
 usb:v1F6F*
  ID_VENDOR_FROM_DATABASE=Aliph
 
@@ -50141,6 +50270,12 @@ usb:v2001pF118*
 usb:v2002*
  ID_VENDOR_FROM_DATABASE=DAP Technologies
 
+usb:v2003*
+ ID_VENDOR_FROM_DATABASE=detectomat
+
+usb:v2003pEA61*
+ ID_MODEL_FROM_DATABASE=dc3500
+
 usb:v200C*
  ID_VENDOR_FROM_DATABASE=Reloop
 
@@ -50237,6 +50372,12 @@ usb:v2019pED17*
 usb:v2019pED18*
  ID_MODEL_FROM_DATABASE=GW-USHyper300 / GW-USH300N 802.11bgn Wireless Adapter [Realtek RTL8191SU]
 
+usb:v203D*
+ ID_VENDOR_FROM_DATABASE=Encore Electronics Inc.
+
+usb:v203Dp1480*
+ ID_MODEL_FROM_DATABASE=ENUWI-N3 [802.11n Wireless N150 Adapter]
+
 usb:v2040*
  ID_VENDOR_FROM_DATABASE=Hauppauge
 
@@ -50372,6 +50513,18 @@ usb:v2047p0855*
 usb:v2047p0964*
  ID_MODEL_FROM_DATABASE=Inventio Software MSP430
 
+usb:v2058*
+ ID_VENDOR_FROM_DATABASE=Nano River Technology
+
+usb:v2058p2058*
+ ID_MODEL_FROM_DATABASE=ViperBoard I2C, SPI, GPIO interface
+
+usb:v2077*
+ ID_VENDOR_FROM_DATABASE=Taicang T&W Electronics Co. Ltd
+
+usb:v2077p9002*
+ ID_MODEL_FROM_DATABASE=W1M100 HSPA/WCDMA Module
+
 usb:v2080*
  ID_VENDOR_FROM_DATABASE=Barnes & Noble
 
@@ -50387,6 +50540,9 @@ usb:v2080p0003*
 usb:v2080p0004*
  ID_MODEL_FROM_DATABASE=NOOK Tablet
 
+usb:v2086*
+ ID_VENDOR_FROM_DATABASE=SIMPASS
+
 usb:v2087*
  ID_VENDOR_FROM_DATABASE=Cando
 
@@ -50453,18 +50609,60 @@ usb:v20B7pC25B*
 usb:v20B7pCB72*
  ID_MODEL_FROM_DATABASE=ben-wpan, cntr
 
+usb:v20CE*
+ ID_VENDOR_FROM_DATABASE=Minicircuits
+
+usb:v20CEp0012*
+ ID_MODEL_FROM_DATABASE=RF Sythesizer 250-4200MHz model SSG-4000LH
+
+usb:v20CEp0021*
+ ID_MODEL_FROM_DATABASE=RF Switch Matrix
+
+usb:v20CEp0022*
+ ID_MODEL_FROM_DATABASE=I/O Controller
+
 usb:v20DF*
  ID_VENDOR_FROM_DATABASE=Simtec Electronics
 
 usb:v20DFp0001*
  ID_MODEL_FROM_DATABASE=Entropy Key [UDEKEY01]
 
+usb:v20F1*
+ ID_VENDOR_FROM_DATABASE=NET New Electronic Technology GmbH
+
+usb:v20F1p0101*
+ ID_MODEL_FROM_DATABASE=iCube3 Camera
+
 usb:v20F4*
  ID_VENDOR_FROM_DATABASE=TRENDnet
 
 usb:v20F4p648B*
  ID_MODEL_FROM_DATABASE=TEW-648UBM 802.11n 150Mbps Micro Wireless N Adapter [Realtek RTL8188CUS]
 
+usb:v20F7*
+ ID_VENDOR_FROM_DATABASE=XIMEA
+
+usb:v20F7pA003*
+ ID_MODEL_FROM_DATABASE=Subminiature 5Mpix B/W Camera, MU9PM-MH
+
+usb:v2100*
+ ID_VENDOR_FROM_DATABASE=RT Systems
+
+usb:v2100p9E52*
+ ID_MODEL_FROM_DATABASE=Yaesu VX-7
+
+usb:v2100p9E54*
+ ID_MODEL_FROM_DATABASE=CT29B Radio Cable
+
+usb:v2100p9E57*
+ ID_MODEL_FROM_DATABASE=RTS01 Radio Cable
+
+usb:v2100p9E5D*
+ ID_MODEL_FROM_DATABASE=K4Y Radio Cable
+
+usb:v2100p9E5F*
+ ID_MODEL_FROM_DATABASE=FT232RL [RTS05 Serial Cable]
+
 usb:v2101*
  ID_VENDOR_FROM_DATABASE=ActionStar
 
@@ -50501,6 +50699,18 @@ usb:v2109p3431*
 usb:v2109p8110*
  ID_MODEL_FROM_DATABASE=Hub
 
+usb:v2113*
+ ID_VENDOR_FROM_DATABASE=Softkinetic
+
+usb:v2113p0137*
+ ID_MODEL_FROM_DATABASE=DepthSense 311 (3D)
+
+usb:v2113p0145*
+ ID_MODEL_FROM_DATABASE=DepthSense 325
+
+usb:v2113p8000*
+ ID_MODEL_FROM_DATABASE=DepthSense 311 (Color)
+
 usb:v2149*
  ID_VENDOR_FROM_DATABASE=Advanced Silicon S.A.
 
@@ -51635,6 +51845,12 @@ usb:v3579*
 usb:v3579p6901*
  ID_MODEL_FROM_DATABASE=Media Reader
 
+usb:v357D*
+ ID_VENDOR_FROM_DATABASE=Sharkoon
+
+usb:v357Dp7788*
+ ID_MODEL_FROM_DATABASE=QuickPort XT
+
 usb:v3636*
  ID_VENDOR_FROM_DATABASE=InVibro
 
@@ -52427,6 +52643,12 @@ usb:v55AApB204*
 usb:v55AApB207*
  ID_MODEL_FROM_DATABASE=Memory Stick Reader
 
+usb:v5654*
+ ID_VENDOR_FROM_DATABASE=Gotview
+
+usb:v5654pCA42*
+ ID_MODEL_FROM_DATABASE=MasterHD 3
+
 usb:v5656*
  ID_VENDOR_FROM_DATABASE=Uni-Trend Group Limited
 
@@ -52706,6 +52928,12 @@ usb:v734Cp5920*
 usb:v734Cp5928*
  ID_MODEL_FROM_DATABASE=Q-Box II DVB-S2 HD
 
+usb:v7373*
+ ID_VENDOR_FROM_DATABASE=Beijing STONE Technology Co. Ltd.
+
+usb:v7373p5740*
+ ID_MODEL_FROM_DATABASE=Intelligent TFT-LCD Module
+
 usb:v7392*
  ID_VENDOR_FROM_DATABASE=Edimax Technology Co., Ltd
 
@@ -52991,6 +53219,12 @@ usb:v9AC4*
 usb:v9AC4p4B8F*
  ID_MODEL_FROM_DATABASE=ProxMark-3 RFID Instrument
 
+usb:v9E88*
+ ID_VENDOR_FROM_DATABASE=Marvell Semiconductor, Inc.
+
+usb:v9E88p9E8F*
+ ID_MODEL_FROM_DATABASE=Plug Computer Basic [SheevaPlug]
+
 usb:vA128*
  ID_VENDOR_FROM_DATABASE=AnMo Electronics Corp. / Dino-Lite (?)
 

commit 7128df76f0caaa05f47e0ba2b5a6efc90c23fc56
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jun 17 23:50:13 2015 +0200

    man: minor typo fix

diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml
index d3ddc1a..4f3f371 100644
--- a/man/systemd.swap.xml
+++ b/man/systemd.swap.xml
@@ -180,7 +180,7 @@
 
         <listitem><para>Swap priority to use when activating the swap
         device or file. This takes an integer. This setting is
-        optional and ignored when priotiry is set by <option>pri=</option> in the
+        optional and ignored when priority is set by <option>pri=</option> in the
         <varname>Options=</varname> option.</para></listitem>
       </varlistentry>
 

commit 1047e12dc1ee6e5ed28f477f4d4b4ebfcf5f3fd7
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jun 17 23:50:02 2015 +0200

    man: run make update-man-list

diff --git a/Makefile-man.am b/Makefile-man.am
index 9e2f4ba..7d31800 100644
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -29,6 +29,30 @@ MANPAGES += \
 	man/sd-id128.3 \
 	man/sd-journal.3 \
 	man/sd_booted.3 \
+	man/sd_bus_creds_get_pid.3 \
+	man/sd_bus_creds_new_from_pid.3 \
+	man/sd_bus_default.3 \
+	man/sd_bus_error.3 \
+	man/sd_bus_message_append.3 \
+	man/sd_bus_message_append_array.3 \
+	man/sd_bus_message_append_basic.3 \
+	man/sd_bus_message_append_string_memfd.3 \
+	man/sd_bus_message_append_strv.3 \
+	man/sd_bus_message_get_cookie.3 \
+	man/sd_bus_message_get_monotonic_usec.3 \
+	man/sd_bus_negotiate_fds.3 \
+	man/sd_bus_new.3 \
+	man/sd_bus_path_encode.3 \
+	man/sd_bus_request_name.3 \
+	man/sd_event_add_child.3 \
+	man/sd_event_add_defer.3 \
+	man/sd_event_add_signal.3 \
+	man/sd_event_add_time.3 \
+	man/sd_event_get_fd.3 \
+	man/sd_event_new.3 \
+	man/sd_event_run.3 \
+	man/sd_event_set_name.3 \
+	man/sd_event_wait.3 \
 	man/sd_id128_get_machine.3 \
 	man/sd_id128_randomize.3 \
 	man/sd_id128_to_string.3 \
@@ -58,6 +82,8 @@ MANPAGES += \
 	man/systemd-analyze.1 \
 	man/systemd-ask-password-console.service.8 \
 	man/systemd-ask-password.1 \
+	man/systemd-bus-proxyd.8 \
+	man/systemd-bus-proxyd at .service.8 \
 	man/systemd-cat.1 \
 	man/systemd-cgls.1 \
 	man/systemd-cgtop.1 \
@@ -165,6 +191,87 @@ MANPAGES_ALIAS += \
 	man/journald.conf.d.5 \
 	man/poweroff.8 \
 	man/reboot.8 \
+	man/sd_bus_creds_get_audit_login_uid.3 \
+	man/sd_bus_creds_get_audit_session_id.3 \
+	man/sd_bus_creds_get_cgroup.3 \
+	man/sd_bus_creds_get_cmdline.3 \
+	man/sd_bus_creds_get_comm.3 \
+	man/sd_bus_creds_get_description.3 \
+	man/sd_bus_creds_get_egid.3 \
+	man/sd_bus_creds_get_euid.3 \
+	man/sd_bus_creds_get_exe.3 \
+	man/sd_bus_creds_get_fsgid.3 \
+	man/sd_bus_creds_get_fsuid.3 \
+	man/sd_bus_creds_get_gid.3 \
+	man/sd_bus_creds_get_mask.3 \
+	man/sd_bus_creds_get_owner_uid.3 \
+	man/sd_bus_creds_get_ppid.3 \
+	man/sd_bus_creds_get_selinux_context.3 \
+	man/sd_bus_creds_get_session.3 \
+	man/sd_bus_creds_get_sgid.3 \
+	man/sd_bus_creds_get_slice.3 \
+	man/sd_bus_creds_get_suid.3 \
+	man/sd_bus_creds_get_supplementary_gids.3 \
+	man/sd_bus_creds_get_tid.3 \
+	man/sd_bus_creds_get_tid_comm.3 \
+	man/sd_bus_creds_get_tty.3 \
+	man/sd_bus_creds_get_uid.3 \
+	man/sd_bus_creds_get_unique_name.3 \
+	man/sd_bus_creds_get_unit.3 \
+	man/sd_bus_creds_get_user_unit.3 \
+	man/sd_bus_creds_get_well_known_names.3 \
+	man/sd_bus_creds_has_bounding_cap.3 \
+	man/sd_bus_creds_has_effective_cap.3 \
+	man/sd_bus_creds_has_inheritable_cap.3 \
+	man/sd_bus_creds_has_permitted_cap.3 \
+	man/sd_bus_creds_ref.3 \
+	man/sd_bus_creds_unref.3 \
+	man/sd_bus_default_system.3 \
+	man/sd_bus_default_user.3 \
+	man/sd_bus_error_copy.3 \
+	man/sd_bus_error_free.3 \
+	man/sd_bus_error_get_errno.3 \
+	man/sd_bus_error_has_name.3 \
+	man/sd_bus_error_is_set.3 \
+	man/sd_bus_error_set.3 \
+	man/sd_bus_error_set_const.3 \
+	man/sd_bus_error_set_errno.3 \
+	man/sd_bus_error_set_errnof.3 \
+	man/sd_bus_message_append_array_iovec.3 \
+	man/sd_bus_message_append_array_memfd.3 \
+	man/sd_bus_message_append_array_space.3 \
+	man/sd_bus_message_append_string_iovec.3 \
+	man/sd_bus_message_append_string_space.3 \
+	man/sd_bus_message_get_realtime_usec.3 \
+	man/sd_bus_message_get_reply_cookie.3 \
+	man/sd_bus_message_get_seqnum.3 \
+	man/sd_bus_negotiate_creds.3 \
+	man/sd_bus_negotiate_timestamps.3 \
+	man/sd_bus_open.3 \
+	man/sd_bus_open_system.3 \
+	man/sd_bus_open_system_machine.3 \
+	man/sd_bus_open_system_remote.3 \
+	man/sd_bus_open_user.3 \
+	man/sd_bus_path_decode.3 \
+	man/sd_bus_ref.3 \
+	man/sd_bus_release_name.3 \
+	man/sd_bus_unref.3 \
+	man/sd_event_add_exit.3 \
+	man/sd_event_add_post.3 \
+	man/sd_event_default.3 \
+	man/sd_event_dispatch.3 \
+	man/sd_event_get_name.3 \
+	man/sd_event_loop.3 \
+	man/sd_event_prepare.3 \
+	man/sd_event_ref.3 \
+	man/sd_event_source_get_child_pid.3 \
+	man/sd_event_source_get_signal.3 \
+	man/sd_event_source_get_time.3 \
+	man/sd_event_source_get_time_accuracy.3 \
+	man/sd_event_source_get_time_clock.3 \
+	man/sd_event_source_set_time.3 \
+	man/sd_event_source_set_time_accuracy.3 \
+	man/sd_event_unref.3 \
 	man/sd_id128_equal.3 \
 	man/sd_id128_from_string.3 \
 	man/sd_id128_get_boot.3 \
@@ -218,6 +325,7 @@ MANPAGES_ALIAS += \
 	man/systemd-ask-password-console.path.8 \
 	man/systemd-ask-password-wall.path.8 \
 	man/systemd-ask-password-wall.service.8 \
+	man/systemd-bus-proxyd.socket.8 \
 	man/systemd-fsck-root.service.8 \
 	man/systemd-fsck.8 \
 	man/systemd-hibernate-resume.8 \
@@ -330,6 +438,87 @@ man/init.1: man/systemd.1
 man/journald.conf.d.5: man/journald.conf.5
 man/poweroff.8: man/halt.8
 man/reboot.8: man/halt.8
+man/sd_bus_creds_get_audit_login_uid.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_audit_session_id.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_cgroup.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_cmdline.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_comm.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_description.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_egid.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_euid.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_exe.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_fsgid.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_fsuid.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_gid.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_mask.3: man/sd_bus_creds_new_from_pid.3
+man/sd_bus_creds_get_owner_uid.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_ppid.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_selinux_context.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_session.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_sgid.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_slice.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_suid.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_supplementary_gids.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_tid.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_tid_comm.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_tty.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_uid.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_unique_name.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_unit.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_user_unit.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_well_known_names.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_has_bounding_cap.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_has_effective_cap.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_has_inheritable_cap.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_has_permitted_cap.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_ref.3: man/sd_bus_creds_new_from_pid.3
+man/sd_bus_creds_unref.3: man/sd_bus_creds_new_from_pid.3
+man/sd_bus_default_system.3: man/sd_bus_default.3
+man/sd_bus_default_user.3: man/sd_bus_default.3
+man/sd_bus_error_copy.3: man/sd_bus_error.3
+man/sd_bus_error_free.3: man/sd_bus_error.3
+man/sd_bus_error_get_errno.3: man/sd_bus_error.3
+man/sd_bus_error_has_name.3: man/sd_bus_error.3
+man/sd_bus_error_is_set.3: man/sd_bus_error.3
+man/sd_bus_error_set.3: man/sd_bus_error.3
+man/sd_bus_error_set_const.3: man/sd_bus_error.3
+man/sd_bus_error_set_errno.3: man/sd_bus_error.3
+man/sd_bus_error_set_errnof.3: man/sd_bus_error.3
+man/sd_bus_message_append_array_iovec.3: man/sd_bus_message_append_array.3
+man/sd_bus_message_append_array_memfd.3: man/sd_bus_message_append_array.3
+man/sd_bus_message_append_array_space.3: man/sd_bus_message_append_array.3
+man/sd_bus_message_append_string_iovec.3: man/sd_bus_message_append_string_memfd.3
+man/sd_bus_message_append_string_space.3: man/sd_bus_message_append_string_memfd.3
+man/sd_bus_message_get_realtime_usec.3: man/sd_bus_message_get_monotonic_usec.3
+man/sd_bus_message_get_reply_cookie.3: man/sd_bus_message_get_cookie.3
+man/sd_bus_message_get_seqnum.3: man/sd_bus_message_get_monotonic_usec.3
+man/sd_bus_negotiate_creds.3: man/sd_bus_negotiate_fds.3
+man/sd_bus_negotiate_timestamps.3: man/sd_bus_negotiate_fds.3
+man/sd_bus_open.3: man/sd_bus_default.3
+man/sd_bus_open_system.3: man/sd_bus_default.3
+man/sd_bus_open_system_machine.3: man/sd_bus_default.3
+man/sd_bus_open_system_remote.3: man/sd_bus_default.3
+man/sd_bus_open_user.3: man/sd_bus_default.3
+man/sd_bus_path_decode.3: man/sd_bus_path_encode.3
+man/sd_bus_ref.3: man/sd_bus_new.3
+man/sd_bus_release_name.3: man/sd_bus_request_name.3
+man/sd_bus_unref.3: man/sd_bus_new.3
+man/sd_event_add_exit.3: man/sd_event_add_defer.3
+man/sd_event_add_post.3: man/sd_event_add_defer.3
+man/sd_event_default.3: man/sd_event_new.3
+man/sd_event_dispatch.3: man/sd_event_wait.3
+man/sd_event_get_name.3: man/sd_event_set_name.3
+man/sd_event_loop.3: man/sd_event_run.3
+man/sd_event_prepare.3: man/sd_event_wait.3
+man/sd_event_ref.3: man/sd_event_new.3
+man/sd_event_source_get_child_pid.3: man/sd_event_add_child.3
+man/sd_event_source_get_signal.3: man/sd_event_add_signal.3
+man/sd_event_source_get_time.3: man/sd_event_add_time.3
+man/sd_event_source_get_time_accuracy.3: man/sd_event_add_time.3
+man/sd_event_source_get_time_clock.3: man/sd_event_add_time.3
+man/sd_event_source_set_time.3: man/sd_event_add_time.3
+man/sd_event_source_set_time_accuracy.3: man/sd_event_add_time.3
+man/sd_event_unref.3: man/sd_event_new.3
 man/sd_id128_equal.3: man/sd-id128.3
 man/sd_id128_from_string.3: man/sd_id128_to_string.3
 man/sd_id128_get_boot.3: man/sd_id128_get_machine.3
@@ -383,6 +572,7 @@ man/system.conf.d.5: man/systemd-system.conf.5
 man/systemd-ask-password-console.path.8: man/systemd-ask-password-console.service.8
 man/systemd-ask-password-wall.path.8: man/systemd-ask-password-console.service.8
 man/systemd-ask-password-wall.service.8: man/systemd-ask-password-console.service.8
+man/systemd-bus-proxyd.socket.8: man/systemd-bus-proxyd at .service.8
 man/systemd-fsck-root.service.8: man/systemd-fsck at .service.8
 man/systemd-fsck.8: man/systemd-fsck at .service.8
 man/systemd-hibernate-resume.8: man/systemd-hibernate-resume at .service.8
@@ -553,106 +743,349 @@ man/poweroff.html: man/halt.html
 man/reboot.html: man/halt.html
 	$(html-alias)
 
-man/sd_id128_equal.html: man/sd-id128.html
+man/sd_bus_creds_get_audit_login_uid.html: man/sd_bus_creds_get_pid.html
 	$(html-alias)
 
-man/sd_id128_from_string.html: man/sd_id128_to_string.html
+man/sd_bus_creds_get_audit_session_id.html: man/sd_bus_creds_get_pid.html
 	$(html-alias)
 
-man/sd_id128_get_boot.html: man/sd_id128_get_machine.html
+man/sd_bus_creds_get_cgroup.html: man/sd_bus_creds_get_pid.html
 	$(html-alias)
 
-man/sd_id128_t.html: man/sd-id128.html
+man/sd_bus_creds_get_cmdline.html: man/sd_bus_creds_get_pid.html
 	$(html-alias)
 
-man/sd_is_mq.html: man/sd_is_fifo.html
+man/sd_bus_creds_get_comm.html: man/sd_bus_creds_get_pid.html
 	$(html-alias)
 
-man/sd_is_socket.html: man/sd_is_fifo.html
+man/sd_bus_creds_get_description.html: man/sd_bus_creds_get_pid.html
 	$(html-alias)
 
-man/sd_is_socket_inet.html: man/sd_is_fifo.html
+man/sd_bus_creds_get_egid.html: man/sd_bus_creds_get_pid.html
 	$(html-alias)
 
-man/sd_is_socket_unix.html: man/sd_is_fifo.html
+man/sd_bus_creds_get_euid.html: man/sd_bus_creds_get_pid.html
 	$(html-alias)
 
-man/sd_is_special.html: man/sd_is_fifo.html
+man/sd_bus_creds_get_exe.html: man/sd_bus_creds_get_pid.html
 	$(html-alias)
 
-man/sd_journal.html: man/sd_journal_open.html
+man/sd_bus_creds_get_fsgid.html: man/sd_bus_creds_get_pid.html
 	$(html-alias)
 
-man/sd_journal_add_conjunction.html: man/sd_journal_add_match.html
+man/sd_bus_creds_get_fsuid.html: man/sd_bus_creds_get_pid.html
 	$(html-alias)
 
-man/sd_journal_add_disjunction.html: man/sd_journal_add_match.html
+man/sd_bus_creds_get_gid.html: man/sd_bus_creds_get_pid.html
 	$(html-alias)
 
-man/sd_journal_close.html: man/sd_journal_open.html
+man/sd_bus_creds_get_mask.html: man/sd_bus_creds_new_from_pid.html
 	$(html-alias)
 
-man/sd_journal_enumerate_data.html: man/sd_journal_get_data.html
+man/sd_bus_creds_get_owner_uid.html: man/sd_bus_creds_get_pid.html
 	$(html-alias)
 
-man/sd_journal_enumerate_unique.html: man/sd_journal_query_unique.html
+man/sd_bus_creds_get_ppid.html: man/sd_bus_creds_get_pid.html
 	$(html-alias)
 
-man/sd_journal_flush_matches.html: man/sd_journal_add_match.html
+man/sd_bus_creds_get_selinux_context.html: man/sd_bus_creds_get_pid.html
 	$(html-alias)
 
-man/sd_journal_get_catalog_for_message_id.html: man/sd_journal_get_catalog.html
+man/sd_bus_creds_get_session.html: man/sd_bus_creds_get_pid.html
 	$(html-alias)
 
-man/sd_journal_get_cutoff_monotonic_usec.html: man/sd_journal_get_cutoff_realtime_usec.html
+man/sd_bus_creds_get_sgid.html: man/sd_bus_creds_get_pid.html
 	$(html-alias)
 
-man/sd_journal_get_data_threshold.html: man/sd_journal_get_data.html
+man/sd_bus_creds_get_slice.html: man/sd_bus_creds_get_pid.html
 	$(html-alias)
 
-man/sd_journal_get_events.html: man/sd_journal_get_fd.html
+man/sd_bus_creds_get_suid.html: man/sd_bus_creds_get_pid.html
 	$(html-alias)
 
-man/sd_journal_get_monotonic_usec.html: man/sd_journal_get_realtime_usec.html
+man/sd_bus_creds_get_supplementary_gids.html: man/sd_bus_creds_get_pid.html
 	$(html-alias)
 
-man/sd_journal_get_timeout.html: man/sd_journal_get_fd.html
+man/sd_bus_creds_get_tid.html: man/sd_bus_creds_get_pid.html
 	$(html-alias)
 
-man/sd_journal_next_skip.html: man/sd_journal_next.html
+man/sd_bus_creds_get_tid_comm.html: man/sd_bus_creds_get_pid.html
 	$(html-alias)
 
-man/sd_journal_open_container.html: man/sd_journal_open.html
+man/sd_bus_creds_get_tty.html: man/sd_bus_creds_get_pid.html
 	$(html-alias)
 
-man/sd_journal_open_directory.html: man/sd_journal_open.html
+man/sd_bus_creds_get_uid.html: man/sd_bus_creds_get_pid.html
 	$(html-alias)
 
-man/sd_journal_open_files.html: man/sd_journal_open.html
+man/sd_bus_creds_get_unique_name.html: man/sd_bus_creds_get_pid.html
 	$(html-alias)
 
-man/sd_journal_perror.html: man/sd_journal_print.html
+man/sd_bus_creds_get_unit.html: man/sd_bus_creds_get_pid.html
 	$(html-alias)
 
-man/sd_journal_previous.html: man/sd_journal_next.html
+man/sd_bus_creds_get_user_unit.html: man/sd_bus_creds_get_pid.html
 	$(html-alias)
 
-man/sd_journal_previous_skip.html: man/sd_journal_next.html
+man/sd_bus_creds_get_well_known_names.html: man/sd_bus_creds_get_pid.html
 	$(html-alias)
 
-man/sd_journal_printv.html: man/sd_journal_print.html
+man/sd_bus_creds_has_bounding_cap.html: man/sd_bus_creds_get_pid.html
 	$(html-alias)
 
-man/sd_journal_process.html: man/sd_journal_get_fd.html
+man/sd_bus_creds_has_effective_cap.html: man/sd_bus_creds_get_pid.html
 	$(html-alias)
 
-man/sd_journal_reliable_fd.html: man/sd_journal_get_fd.html
+man/sd_bus_creds_has_inheritable_cap.html: man/sd_bus_creds_get_pid.html
 	$(html-alias)
 
-man/sd_journal_restart_data.html: man/sd_journal_get_data.html
+man/sd_bus_creds_has_permitted_cap.html: man/sd_bus_creds_get_pid.html
 	$(html-alias)
 
-man/sd_journal_restart_unique.html: man/sd_journal_query_unique.html
+man/sd_bus_creds_ref.html: man/sd_bus_creds_new_from_pid.html
+	$(html-alias)
+
+man/sd_bus_creds_unref.html: man/sd_bus_creds_new_from_pid.html
+	$(html-alias)
+
+man/sd_bus_default_system.html: man/sd_bus_default.html
+	$(html-alias)
+
+man/sd_bus_default_user.html: man/sd_bus_default.html
+	$(html-alias)
+
+man/sd_bus_error_copy.html: man/sd_bus_error.html
+	$(html-alias)
+
+man/sd_bus_error_free.html: man/sd_bus_error.html
+	$(html-alias)
+
+man/sd_bus_error_get_errno.html: man/sd_bus_error.html
+	$(html-alias)
+
+man/sd_bus_error_has_name.html: man/sd_bus_error.html
+	$(html-alias)
+
+man/sd_bus_error_is_set.html: man/sd_bus_error.html
+	$(html-alias)
+
+man/sd_bus_error_set.html: man/sd_bus_error.html
+	$(html-alias)
+
+man/sd_bus_error_set_const.html: man/sd_bus_error.html
+	$(html-alias)
+
+man/sd_bus_error_set_errno.html: man/sd_bus_error.html
+	$(html-alias)
+
+man/sd_bus_error_set_errnof.html: man/sd_bus_error.html
+	$(html-alias)
+
+man/sd_bus_message_append_array_iovec.html: man/sd_bus_message_append_array.html
+	$(html-alias)
+
+man/sd_bus_message_append_array_memfd.html: man/sd_bus_message_append_array.html
+	$(html-alias)
+
+man/sd_bus_message_append_array_space.html: man/sd_bus_message_append_array.html
+	$(html-alias)
+
+man/sd_bus_message_append_string_iovec.html: man/sd_bus_message_append_string_memfd.html
+	$(html-alias)
+
+man/sd_bus_message_append_string_space.html: man/sd_bus_message_append_string_memfd.html
+	$(html-alias)
+
+man/sd_bus_message_get_realtime_usec.html: man/sd_bus_message_get_monotonic_usec.html
+	$(html-alias)
+
+man/sd_bus_message_get_reply_cookie.html: man/sd_bus_message_get_cookie.html
+	$(html-alias)
+
+man/sd_bus_message_get_seqnum.html: man/sd_bus_message_get_monotonic_usec.html
+	$(html-alias)
+
+man/sd_bus_negotiate_creds.html: man/sd_bus_negotiate_fds.html
+	$(html-alias)
+
+man/sd_bus_negotiate_timestamps.html: man/sd_bus_negotiate_fds.html
+	$(html-alias)
+
+man/sd_bus_open.html: man/sd_bus_default.html
+	$(html-alias)
+
+man/sd_bus_open_system.html: man/sd_bus_default.html
+	$(html-alias)
+
+man/sd_bus_open_system_machine.html: man/sd_bus_default.html
+	$(html-alias)
+
+man/sd_bus_open_system_remote.html: man/sd_bus_default.html
+	$(html-alias)
+
+man/sd_bus_open_user.html: man/sd_bus_default.html
+	$(html-alias)
+
+man/sd_bus_path_decode.html: man/sd_bus_path_encode.html
+	$(html-alias)
+
+man/sd_bus_ref.html: man/sd_bus_new.html
+	$(html-alias)
+
+man/sd_bus_release_name.html: man/sd_bus_request_name.html
+	$(html-alias)
+
+man/sd_bus_unref.html: man/sd_bus_new.html
+	$(html-alias)
+
+man/sd_event_add_exit.html: man/sd_event_add_defer.html
+	$(html-alias)
+
+man/sd_event_add_post.html: man/sd_event_add_defer.html
+	$(html-alias)
+
+man/sd_event_default.html: man/sd_event_new.html
+	$(html-alias)
+
+man/sd_event_dispatch.html: man/sd_event_wait.html
+	$(html-alias)
+
+man/sd_event_get_name.html: man/sd_event_set_name.html
+	$(html-alias)
+
+man/sd_event_loop.html: man/sd_event_run.html
+	$(html-alias)
+
+man/sd_event_prepare.html: man/sd_event_wait.html
+	$(html-alias)
+
+man/sd_event_ref.html: man/sd_event_new.html
+	$(html-alias)
+
+man/sd_event_source_get_child_pid.html: man/sd_event_add_child.html
+	$(html-alias)
+
+man/sd_event_source_get_signal.html: man/sd_event_add_signal.html
+	$(html-alias)
+
+man/sd_event_source_get_time.html: man/sd_event_add_time.html
+	$(html-alias)
+
+man/sd_event_source_get_time_accuracy.html: man/sd_event_add_time.html
+	$(html-alias)
+
+man/sd_event_source_get_time_clock.html: man/sd_event_add_time.html
+	$(html-alias)
+
+man/sd_event_source_set_time.html: man/sd_event_add_time.html
+	$(html-alias)
+
+man/sd_event_source_set_time_accuracy.html: man/sd_event_add_time.html
+	$(html-alias)
+
+man/sd_event_unref.html: man/sd_event_new.html
+	$(html-alias)
+
+man/sd_id128_equal.html: man/sd-id128.html
+	$(html-alias)
+
+man/sd_id128_from_string.html: man/sd_id128_to_string.html
+	$(html-alias)
+
+man/sd_id128_get_boot.html: man/sd_id128_get_machine.html
+	$(html-alias)
+
+man/sd_id128_t.html: man/sd-id128.html
+	$(html-alias)
+
+man/sd_is_mq.html: man/sd_is_fifo.html
+	$(html-alias)
+
+man/sd_is_socket.html: man/sd_is_fifo.html
+	$(html-alias)
+
+man/sd_is_socket_inet.html: man/sd_is_fifo.html
+	$(html-alias)
+
+man/sd_is_socket_unix.html: man/sd_is_fifo.html
+	$(html-alias)
+
+man/sd_is_special.html: man/sd_is_fifo.html
+	$(html-alias)
+
+man/sd_journal.html: man/sd_journal_open.html
+	$(html-alias)
+
+man/sd_journal_add_conjunction.html: man/sd_journal_add_match.html
+	$(html-alias)
+
+man/sd_journal_add_disjunction.html: man/sd_journal_add_match.html
+	$(html-alias)
+
+man/sd_journal_close.html: man/sd_journal_open.html
+	$(html-alias)
+
+man/sd_journal_enumerate_data.html: man/sd_journal_get_data.html
+	$(html-alias)
+
+man/sd_journal_enumerate_unique.html: man/sd_journal_query_unique.html
+	$(html-alias)
+
+man/sd_journal_flush_matches.html: man/sd_journal_add_match.html
+	$(html-alias)
+
+man/sd_journal_get_catalog_for_message_id.html: man/sd_journal_get_catalog.html
+	$(html-alias)
+
+man/sd_journal_get_cutoff_monotonic_usec.html: man/sd_journal_get_cutoff_realtime_usec.html
+	$(html-alias)
+
+man/sd_journal_get_data_threshold.html: man/sd_journal_get_data.html
+	$(html-alias)
+
+man/sd_journal_get_events.html: man/sd_journal_get_fd.html
+	$(html-alias)
+
+man/sd_journal_get_monotonic_usec.html: man/sd_journal_get_realtime_usec.html
+	$(html-alias)
+
+man/sd_journal_get_timeout.html: man/sd_journal_get_fd.html
+	$(html-alias)
+
+man/sd_journal_next_skip.html: man/sd_journal_next.html
+	$(html-alias)
+
+man/sd_journal_open_container.html: man/sd_journal_open.html
+	$(html-alias)
+
+man/sd_journal_open_directory.html: man/sd_journal_open.html
+	$(html-alias)
+
+man/sd_journal_open_files.html: man/sd_journal_open.html
+	$(html-alias)
+
+man/sd_journal_perror.html: man/sd_journal_print.html
+	$(html-alias)
+
+man/sd_journal_previous.html: man/sd_journal_next.html
+	$(html-alias)
+
+man/sd_journal_previous_skip.html: man/sd_journal_next.html
+	$(html-alias)
+
+man/sd_journal_printv.html: man/sd_journal_print.html
+	$(html-alias)
+
+man/sd_journal_process.html: man/sd_journal_get_fd.html
+	$(html-alias)
+
+man/sd_journal_reliable_fd.html: man/sd_journal_get_fd.html
+	$(html-alias)
+
+man/sd_journal_restart_data.html: man/sd_journal_get_data.html
+	$(html-alias)
+
+man/sd_journal_restart_unique.html: man/sd_journal_query_unique.html
 	$(html-alias)
 
 man/sd_journal_seek_cursor.html: man/sd_journal_seek_head.html
@@ -712,6 +1145,9 @@ man/systemd-ask-password-wall.path.html: man/systemd-ask-password-console.servic
 man/systemd-ask-password-wall.service.html: man/systemd-ask-password-console.service.html
 	$(html-alias)
 
+man/systemd-bus-proxyd.socket.html: man/systemd-bus-proxyd at .service.html
+	$(html-alias)
+
 man/systemd-fsck-root.service.html: man/systemd-fsck at .service.html
 	$(html-alias)
 
@@ -1052,444 +1488,6 @@ MANPAGES_ALIAS += \
 
 endif
 
-MANPAGES += \
-	man/sd_bus_creds_get_pid.3 \
-	man/sd_bus_creds_new_from_pid.3 \
-	man/sd_bus_default.3 \
-	man/sd_bus_error.3 \
-	man/sd_bus_message_append.3 \
-	man/sd_bus_message_append_array.3 \
-	man/sd_bus_message_append_basic.3 \
-	man/sd_bus_message_append_string_memfd.3 \
-	man/sd_bus_message_append_strv.3 \
-	man/sd_bus_message_get_cookie.3 \
-	man/sd_bus_message_get_monotonic_usec.3 \
-	man/sd_bus_negotiate_fds.3 \
-	man/sd_bus_new.3 \
-	man/sd_bus_path_encode.3 \
-	man/sd_bus_request_name.3 \
-	man/sd_event_add_child.3 \
-	man/sd_event_add_defer.3 \
-	man/sd_event_add_signal.3 \
-	man/sd_event_add_time.3 \
-	man/sd_event_get_fd.3 \
-	man/sd_event_new.3 \
-	man/sd_event_run.3 \
-	man/sd_event_set_name.3 \
-	man/sd_event_wait.3 \
-	man/systemd-bus-proxyd.8 \
-	man/systemd-bus-proxyd at .service.8
-MANPAGES_ALIAS += \
-	man/sd_bus_creds_get_audit_login_uid.3 \
-	man/sd_bus_creds_get_audit_session_id.3 \
-	man/sd_bus_creds_get_cgroup.3 \
-	man/sd_bus_creds_get_cmdline.3 \
-	man/sd_bus_creds_get_comm.3 \
-	man/sd_bus_creds_get_description.3 \
-	man/sd_bus_creds_get_egid.3 \
-	man/sd_bus_creds_get_euid.3 \
-	man/sd_bus_creds_get_exe.3 \
-	man/sd_bus_creds_get_fsgid.3 \
-	man/sd_bus_creds_get_fsuid.3 \
-	man/sd_bus_creds_get_gid.3 \
-	man/sd_bus_creds_get_mask.3 \
-	man/sd_bus_creds_get_owner_uid.3 \
-	man/sd_bus_creds_get_ppid.3 \
-	man/sd_bus_creds_get_selinux_context.3 \
-	man/sd_bus_creds_get_session.3 \
-	man/sd_bus_creds_get_sgid.3 \
-	man/sd_bus_creds_get_slice.3 \
-	man/sd_bus_creds_get_suid.3 \
-	man/sd_bus_creds_get_supplementary_gids.3 \
-	man/sd_bus_creds_get_tid.3 \
-	man/sd_bus_creds_get_tid_comm.3 \
-	man/sd_bus_creds_get_tty.3 \
-	man/sd_bus_creds_get_uid.3 \
-	man/sd_bus_creds_get_unique_name.3 \
-	man/sd_bus_creds_get_unit.3 \
-	man/sd_bus_creds_get_user_unit.3 \
-	man/sd_bus_creds_get_well_known_names.3 \
-	man/sd_bus_creds_has_bounding_cap.3 \
-	man/sd_bus_creds_has_effective_cap.3 \
-	man/sd_bus_creds_has_inheritable_cap.3 \
-	man/sd_bus_creds_has_permitted_cap.3 \
-	man/sd_bus_creds_ref.3 \
-	man/sd_bus_creds_unref.3 \
-	man/sd_bus_default_system.3 \
-	man/sd_bus_default_user.3 \
-	man/sd_bus_error_copy.3 \
-	man/sd_bus_error_free.3 \
-	man/sd_bus_error_get_errno.3 \
-	man/sd_bus_error_has_name.3 \
-	man/sd_bus_error_is_set.3 \
-	man/sd_bus_error_set.3 \
-	man/sd_bus_error_set_const.3 \
-	man/sd_bus_error_set_errno.3 \
-	man/sd_bus_error_set_errnof.3 \
-	man/sd_bus_message_append_array_iovec.3 \
-	man/sd_bus_message_append_array_memfd.3 \
-	man/sd_bus_message_append_array_space.3 \
-	man/sd_bus_message_append_string_iovec.3 \
-	man/sd_bus_message_append_string_space.3 \
-	man/sd_bus_message_get_realtime_usec.3 \
-	man/sd_bus_message_get_reply_cookie.3 \
-	man/sd_bus_message_get_seqnum.3 \
-	man/sd_bus_negotiate_creds.3 \
-	man/sd_bus_negotiate_timestamps.3 \
-	man/sd_bus_open.3 \
-	man/sd_bus_open_system.3 \
-	man/sd_bus_open_system_machine.3 \
-	man/sd_bus_open_system_remote.3 \
-	man/sd_bus_open_user.3 \
-	man/sd_bus_path_decode.3 \
-	man/sd_bus_ref.3 \
-	man/sd_bus_release_name.3 \
-	man/sd_bus_unref.3 \
-	man/sd_event_add_exit.3 \
-	man/sd_event_add_post.3 \
-	man/sd_event_default.3 \
-	man/sd_event_dispatch.3 \
-	man/sd_event_get_name.3 \
-	man/sd_event_loop.3 \
-	man/sd_event_prepare.3 \
-	man/sd_event_ref.3 \
-	man/sd_event_source_get_child_pid.3 \
-	man/sd_event_source_get_signal.3 \
-	man/sd_event_source_get_time.3 \
-	man/sd_event_source_get_time_accuracy.3 \
-	man/sd_event_source_get_time_clock.3 \
-	man/sd_event_source_set_time.3 \
-	man/sd_event_source_set_time_accuracy.3 \
-	man/sd_event_unref.3 \
-	man/systemd-bus-proxyd.socket.8
-man/sd_bus_creds_get_audit_login_uid.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_audit_session_id.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_cgroup.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_cmdline.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_comm.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_description.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_egid.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_euid.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_exe.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_fsgid.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_fsuid.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_gid.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_mask.3: man/sd_bus_creds_new_from_pid.3
-man/sd_bus_creds_get_owner_uid.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_ppid.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_selinux_context.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_session.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_sgid.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_slice.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_suid.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_supplementary_gids.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_tid.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_tid_comm.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_tty.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_uid.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_unique_name.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_unit.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_user_unit.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_well_known_names.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_has_bounding_cap.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_has_effective_cap.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_has_inheritable_cap.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_has_permitted_cap.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_ref.3: man/sd_bus_creds_new_from_pid.3
-man/sd_bus_creds_unref.3: man/sd_bus_creds_new_from_pid.3
-man/sd_bus_default_system.3: man/sd_bus_default.3
-man/sd_bus_default_user.3: man/sd_bus_default.3
-man/sd_bus_error_copy.3: man/sd_bus_error.3
-man/sd_bus_error_free.3: man/sd_bus_error.3
-man/sd_bus_error_get_errno.3: man/sd_bus_error.3
-man/sd_bus_error_has_name.3: man/sd_bus_error.3
-man/sd_bus_error_is_set.3: man/sd_bus_error.3
-man/sd_bus_error_set.3: man/sd_bus_error.3
-man/sd_bus_error_set_const.3: man/sd_bus_error.3
-man/sd_bus_error_set_errno.3: man/sd_bus_error.3
-man/sd_bus_error_set_errnof.3: man/sd_bus_error.3
-man/sd_bus_message_append_array_iovec.3: man/sd_bus_message_append_array.3
-man/sd_bus_message_append_array_memfd.3: man/sd_bus_message_append_array.3
-man/sd_bus_message_append_array_space.3: man/sd_bus_message_append_array.3
-man/sd_bus_message_append_string_iovec.3: man/sd_bus_message_append_string_memfd.3
-man/sd_bus_message_append_string_space.3: man/sd_bus_message_append_string_memfd.3
-man/sd_bus_message_get_realtime_usec.3: man/sd_bus_message_get_monotonic_usec.3
-man/sd_bus_message_get_reply_cookie.3: man/sd_bus_message_get_cookie.3
-man/sd_bus_message_get_seqnum.3: man/sd_bus_message_get_monotonic_usec.3
-man/sd_bus_negotiate_creds.3: man/sd_bus_negotiate_fds.3
-man/sd_bus_negotiate_timestamps.3: man/sd_bus_negotiate_fds.3
-man/sd_bus_open.3: man/sd_bus_default.3
-man/sd_bus_open_system.3: man/sd_bus_default.3
-man/sd_bus_open_system_machine.3: man/sd_bus_default.3
-man/sd_bus_open_system_remote.3: man/sd_bus_default.3
-man/sd_bus_open_user.3: man/sd_bus_default.3
-man/sd_bus_path_decode.3: man/sd_bus_path_encode.3
-man/sd_bus_ref.3: man/sd_bus_new.3
-man/sd_bus_release_name.3: man/sd_bus_request_name.3
-man/sd_bus_unref.3: man/sd_bus_new.3
-man/sd_event_add_exit.3: man/sd_event_add_defer.3
-man/sd_event_add_post.3: man/sd_event_add_defer.3
-man/sd_event_default.3: man/sd_event_new.3
-man/sd_event_dispatch.3: man/sd_event_wait.3
-man/sd_event_get_name.3: man/sd_event_set_name.3
-man/sd_event_loop.3: man/sd_event_run.3
-man/sd_event_prepare.3: man/sd_event_wait.3
-man/sd_event_ref.3: man/sd_event_new.3
-man/sd_event_source_get_child_pid.3: man/sd_event_add_child.3
-man/sd_event_source_get_signal.3: man/sd_event_add_signal.3
-man/sd_event_source_get_time.3: man/sd_event_add_time.3
-man/sd_event_source_get_time_accuracy.3: man/sd_event_add_time.3
-man/sd_event_source_get_time_clock.3: man/sd_event_add_time.3
-man/sd_event_source_set_time.3: man/sd_event_add_time.3
-man/sd_event_source_set_time_accuracy.3: man/sd_event_add_time.3
-man/sd_event_unref.3: man/sd_event_new.3
-man/systemd-bus-proxyd.socket.8: man/systemd-bus-proxyd at .service.8
-man/sd_bus_creds_get_audit_login_uid.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_audit_session_id.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_cgroup.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_cmdline.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_comm.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_description.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_egid.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_euid.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_exe.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_fsgid.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_fsuid.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_gid.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_mask.html: man/sd_bus_creds_new_from_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_owner_uid.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_ppid.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_selinux_context.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_session.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_sgid.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_slice.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_suid.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_supplementary_gids.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_tid.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_tid_comm.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_tty.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_uid.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_unique_name.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_unit.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_user_unit.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_get_well_known_names.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_has_bounding_cap.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_has_effective_cap.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_has_inheritable_cap.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_has_permitted_cap.html: man/sd_bus_creds_get_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_ref.html: man/sd_bus_creds_new_from_pid.html
-	$(html-alias)
-
-man/sd_bus_creds_unref.html: man/sd_bus_creds_new_from_pid.html
-	$(html-alias)
-
-man/sd_bus_default_system.html: man/sd_bus_default.html
-	$(html-alias)
-
-man/sd_bus_default_user.html: man/sd_bus_default.html
-	$(html-alias)
-
-man/sd_bus_error_copy.html: man/sd_bus_error.html
-	$(html-alias)
-
-man/sd_bus_error_free.html: man/sd_bus_error.html
-	$(html-alias)
-
-man/sd_bus_error_get_errno.html: man/sd_bus_error.html
-	$(html-alias)
-
-man/sd_bus_error_has_name.html: man/sd_bus_error.html
-	$(html-alias)
-
-man/sd_bus_error_is_set.html: man/sd_bus_error.html
-	$(html-alias)
-
-man/sd_bus_error_set.html: man/sd_bus_error.html
-	$(html-alias)
-
-man/sd_bus_error_set_const.html: man/sd_bus_error.html
-	$(html-alias)
-
-man/sd_bus_error_set_errno.html: man/sd_bus_error.html
-	$(html-alias)
-
-man/sd_bus_error_set_errnof.html: man/sd_bus_error.html
-	$(html-alias)
-
-man/sd_bus_message_append_array_iovec.html: man/sd_bus_message_append_array.html
-	$(html-alias)
-
-man/sd_bus_message_append_array_memfd.html: man/sd_bus_message_append_array.html
-	$(html-alias)
-
-man/sd_bus_message_append_array_space.html: man/sd_bus_message_append_array.html
-	$(html-alias)
-
-man/sd_bus_message_append_string_iovec.html: man/sd_bus_message_append_string_memfd.html
-	$(html-alias)
-
-man/sd_bus_message_append_string_space.html: man/sd_bus_message_append_string_memfd.html
-	$(html-alias)
-
-man/sd_bus_message_get_realtime_usec.html: man/sd_bus_message_get_monotonic_usec.html
-	$(html-alias)
-
-man/sd_bus_message_get_reply_cookie.html: man/sd_bus_message_get_cookie.html
-	$(html-alias)
-
-man/sd_bus_message_get_seqnum.html: man/sd_bus_message_get_monotonic_usec.html
-	$(html-alias)
-
-man/sd_bus_negotiate_creds.html: man/sd_bus_negotiate_fds.html
-	$(html-alias)
-
-man/sd_bus_negotiate_timestamps.html: man/sd_bus_negotiate_fds.html
-	$(html-alias)
-
-man/sd_bus_open.html: man/sd_bus_default.html
-	$(html-alias)
-
-man/sd_bus_open_system.html: man/sd_bus_default.html
-	$(html-alias)
-
-man/sd_bus_open_system_machine.html: man/sd_bus_default.html
-	$(html-alias)
-
-man/sd_bus_open_system_remote.html: man/sd_bus_default.html
-	$(html-alias)
-
-man/sd_bus_open_user.html: man/sd_bus_default.html
-	$(html-alias)
-
-man/sd_bus_path_decode.html: man/sd_bus_path_encode.html
-	$(html-alias)
-
-man/sd_bus_ref.html: man/sd_bus_new.html
-	$(html-alias)
-
-man/sd_bus_release_name.html: man/sd_bus_request_name.html
-	$(html-alias)
-
-man/sd_bus_unref.html: man/sd_bus_new.html
-	$(html-alias)
-
-man/sd_event_add_exit.html: man/sd_event_add_defer.html
-	$(html-alias)
-
-man/sd_event_add_post.html: man/sd_event_add_defer.html
-	$(html-alias)
-
-man/sd_event_default.html: man/sd_event_new.html
-	$(html-alias)
-
-man/sd_event_dispatch.html: man/sd_event_wait.html
-	$(html-alias)
-
-man/sd_event_get_name.html: man/sd_event_set_name.html
-	$(html-alias)
-
-man/sd_event_loop.html: man/sd_event_run.html
-	$(html-alias)
-
-man/sd_event_prepare.html: man/sd_event_wait.html
-	$(html-alias)
-
-man/sd_event_ref.html: man/sd_event_new.html
-	$(html-alias)
-
-man/sd_event_source_get_child_pid.html: man/sd_event_add_child.html
-	$(html-alias)
-
-man/sd_event_source_get_signal.html: man/sd_event_add_signal.html
-	$(html-alias)
-
-man/sd_event_source_get_time.html: man/sd_event_add_time.html
-	$(html-alias)
-
-man/sd_event_source_get_time_accuracy.html: man/sd_event_add_time.html
-	$(html-alias)
-
-man/sd_event_source_get_time_clock.html: man/sd_event_add_time.html
-	$(html-alias)
-
-man/sd_event_source_set_time.html: man/sd_event_add_time.html
-	$(html-alias)
-
-man/sd_event_source_set_time_accuracy.html: man/sd_event_add_time.html
-	$(html-alias)
-
-man/sd_event_unref.html: man/sd_event_new.html
-	$(html-alias)
-
-man/systemd-bus-proxyd.socket.html: man/systemd-bus-proxyd at .service.html
-	$(html-alias)
-
 if ENABLE_LOCALED
 MANPAGES += \
 	man/localectl.1 \

commit 7663da324a75e1d5500326bd01f3d79c2a29d0c6
Merge: 921ee38 1187861
Author: Tom Gundersen <teg at jklm.no>
Date:   Wed Jun 17 23:27:39 2015 +0200

    Merge pull request #270 from phomes/master
    
    udevd: remove dead code


commit 44cf96e33e83bc9fadad552bda3962e5305e5c2b
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jun 17 23:04:02 2015 +0200

    journal: make sure the clock increases strict monotonic
    
    Let's work around crappy clocks in test-journal-interleaving.c too. This
    does the same as 98d2a5341788b49e82d628dfdc2e241af6d70dcd but for
    test-journal-interlaving.c rather than test-journal-stream.c.

diff --git a/src/journal/test-journal-interleaving.c b/src/journal/test-journal-interleaving.c
index c2fc123..adefa1b 100644
--- a/src/journal/test-journal-interleaving.c
+++ b/src/journal/test-journal-interleaving.c
@@ -62,10 +62,19 @@ static void test_close(JournalFile *f) {
 static void append_number(JournalFile *f, int n, uint64_t *seqnum) {
         char *p;
         dual_timestamp ts;
+        static dual_timestamp previous_ts = {};
         struct iovec iovec[1];
 
         dual_timestamp_get(&ts);
 
+        if (ts.monotonic <= previous_ts.monotonic)
+                ts.monotonic = previous_ts.monotonic + 1;
+
+        if (ts.realtime <= previous_ts.realtime)
+                ts.realtime = previous_ts.realtime + 1;
+
+        previous_ts = ts;
+
         assert_se(asprintf(&p, "NUMBER=%d", n) >= 0);
         iovec[0].iov_base = p;
         iovec[0].iov_len = strlen(p);

commit 921ee38ff6222d9716da877639b2a0e9195c3a60
Merge: de58737 e738c94
Author: Martin Pitt <martin.pitt at ubuntu.com>
Date:   Wed Jun 17 23:10:19 2015 +0200

    Merge pull request #275 from poettering/acl-fixes
    
    acl-util: various smaller fixes to parse_acl()


commit de587378ea5d22e11373b18b4fcabf8f26f89529
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jun 17 23:03:27 2015 +0200

    update TODO

diff --git a/TODO b/TODO
index 914261f..f912645 100644
--- a/TODO
+++ b/TODO
@@ -28,6 +28,8 @@ External:
 
 Features:
 
+* man: clarify that "machinectl show" shows different information than "machinectl status" (no cgroup tree, no IP addresses, ...)
+
 * "systemctl daemon-reload" should result in /etc/systemd/system.conf being reloaded by systemd
 
 * install: include generator dirs in unit file search paths

commit 30654aa0d42e1c9e67a286357e0b3b1409e6a4eb
Merge: 2c8d248 98d2a53
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jun 17 22:56:09 2015 +0200

    Merge pull request #271 from poettering/test-journal-stream-crappy-clock
    
    journal: ensure test-journal-stream doesn't get confused by crappy cl…


commit 97af81cffa6891b361521d3fc0b6ea10b478d59d
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jun 17 22:43:46 2015 +0200

    bus-proxy: add new dbus policy search paths from /usr
    
    D-Bus upstream is working on extending the configuration/policy search
    path, follow this.
    
    See #274 for details.

diff --git a/src/bus-proxyd/proxy.c b/src/bus-proxyd/proxy.c
index aa5010c..28ab1c9 100644
--- a/src/bus-proxyd/proxy.c
+++ b/src/bus-proxyd/proxy.c
@@ -275,12 +275,16 @@ int proxy_set_policy(Proxy *p, SharedPolicy *sp, char **configuration) {
                         return log_error_errno(r, "Couldn't determine bus scope: %m");
 
                 if (streq(scope, "system"))
-                        strv = strv_new("/etc/dbus-1/system.conf",
+                        strv = strv_new("/usr/share/dbus-1/system.conf",
+                                        "/etc/dbus-1/system.conf",
+                                        "/usr/share/dbus-1/system.d/",
                                         "/etc/dbus-1/system.d/",
                                         "/etc/dbus-1/system-local.conf",
                                         NULL);
                 else if (streq(scope, "user"))
-                        strv = strv_new("/etc/dbus-1/session.conf",
+                        strv = strv_new("/usr/share/dbus-1/session.conf",
+                                        "/etc/dbus-1/session.conf",
+                                        "/usr/share/dbus-1/session.d/",
                                         "/etc/dbus-1/session.d/",
                                         "/etc/dbus-1/session-local.conf",
                                         NULL);

commit 2c8d248c335df9160ed7af2eca968d52e542ae22
Merge: d5df0d9 7bb0921
Author: Martin Pitt <martin.pitt at ubuntu.com>
Date:   Wed Jun 17 22:35:19 2015 +0200

    Merge pull request #273 from teg/libudev-device-get-sysattrs
    
    libudev: device - fix typo in udev_device_get_sysattr_list_entry()


commit e738c945ec16e14b96eab402024b0caca47f89d8
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jun 17 22:08:21 2015 +0200

    acl-util: various smaller fixes to parse_acl()
    
    - Make string parameter const
    
    - Don't log some OOM errors, but not others
    
    - Don't eat up errors generated by acl_from_text()
    
    - Make sure check for success of every single strv_push() call

diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c
index 466f9aa..bd8c988 100644
--- a/src/shared/acl-util.c
+++ b/src/shared/acl-util.c
@@ -223,7 +223,7 @@ int acl_search_groups(const char *path, char ***ret_groups) {
         return ret;
 }
 
-int parse_acl(char *text, acl_t *acl_access, acl_t *acl_default, bool want_mask) {
+int parse_acl(const char *text, acl_t *acl_access, acl_t *acl_default, bool want_mask) {
         _cleanup_free_ char **a = NULL, **d = NULL; /* strings are not be freed */
         _cleanup_strv_free_ char **split;
         char **entry;
@@ -232,7 +232,7 @@ int parse_acl(char *text, acl_t *acl_access, acl_t *acl_default, bool want_mask)
 
         split = strv_split(text, ",");
         if (!split)
-                return log_oom();
+                return -ENOMEM;
 
         STRV_FOREACH(entry, split) {
                 char *p;
@@ -245,9 +245,9 @@ int parse_acl(char *text, acl_t *acl_access, acl_t *acl_default, bool want_mask)
                         r = strv_push(&d, p);
                 else
                         r = strv_push(&a, *entry);
+                if (r < 0)
+                        return r;
         }
-        if (r < 0)
-                return r;
 
         if (!strv_isempty(a)) {
                 _cleanup_free_ char *join;
@@ -258,7 +258,7 @@ int parse_acl(char *text, acl_t *acl_access, acl_t *acl_default, bool want_mask)
 
                 a_acl = acl_from_text(join);
                 if (!a_acl)
-                        return -EINVAL;
+                        return -errno;
 
                 if (want_mask) {
                         r = calc_acl_mask_if_needed(&a_acl);
@@ -276,7 +276,7 @@ int parse_acl(char *text, acl_t *acl_access, acl_t *acl_default, bool want_mask)
 
                 d_acl = acl_from_text(join);
                 if (!d_acl)
-                        return -EINVAL;
+                        return -errno;
 
                 if (want_mask) {
                         r = calc_acl_mask_if_needed(&d_acl);
@@ -288,6 +288,7 @@ int parse_acl(char *text, acl_t *acl_access, acl_t *acl_default, bool want_mask)
         *acl_access = a_acl;
         *acl_default = d_acl;
         a_acl = d_acl = NULL;
+
         return 0;
 }
 
diff --git a/src/shared/acl-util.h b/src/shared/acl-util.h
index c8bcc26..cf612e8 100644
--- a/src/shared/acl-util.h
+++ b/src/shared/acl-util.h
@@ -33,7 +33,7 @@ int acl_find_uid(acl_t acl, uid_t uid, acl_entry_t *entry);
 int calc_acl_mask_if_needed(acl_t *acl_p);
 int add_base_acls_if_needed(acl_t *acl_p, const char *path);
 int acl_search_groups(const char* path, char ***ret_groups);
-int parse_acl(char *text, acl_t *acl_access, acl_t *acl_default, bool want_mask);
+int parse_acl(const char *text, acl_t *acl_access, acl_t *acl_default, bool want_mask);
 int acls_for_file(const char *path, acl_type_t type, acl_t new, acl_t *acl);
 
 /* acl_free takes multiple argument types.

commit 7bb092142e2022edcc9958ce1bd50f59d01c5b6f
Author: Tom Gundersen <teg at jklm.no>
Date:   Wed Jun 17 21:57:25 2015 +0200

    libudev: device - fix typo in udev_device_get_sysattr_list_entry()
    
    We were adding the attributes to the wrong list.

diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c
index c27b01d..9a8d682 100644
--- a/src/libudev/libudev-device.c
+++ b/src/libudev/libudev-device.c
@@ -871,7 +871,7 @@ _public_ struct udev_list_entry *udev_device_get_sysattr_list_entry(struct udev_
                 udev_list_cleanup(&udev_device->sysattrs);
 
                 FOREACH_DEVICE_SYSATTR(udev_device->device, sysattr)
-                        udev_list_entry_add(&udev_device->properties, sysattr, NULL);
+                        udev_list_entry_add(&udev_device->sysattrs, sysattr, NULL);
 
                 udev_device->sysattrs_read = true;
         }

commit d5df0d950f8bc91633800476947b5f856a10fc08
Merge: 7391cb5 b0fe29f
Author: Daniel Mack <github at zonque.org>
Date:   Wed Jun 17 21:37:46 2015 +0200

    Merge pull request #248 from llua/zsh-completion
    
    zsh-completion: _loginctl - general bug fixes


commit 503546da7cb28219193ccad70b9682bede1f62e5
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jun 17 20:54:45 2015 +0200

    nspawn: when exiting, flush all remaining bytes from the pty to stdout
    
    This is a simpler fix for #210, it simply uses copy_bytes() for the
    copying.

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 3c31629..d1154de 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -4972,6 +4972,10 @@ finish:
         if (pid > 0)
                 kill(pid, SIGKILL);
 
+        /* Try to flush whatever is still queued in the pty */
+        if (master >= 0)
+                (void) copy_bytes(master, STDOUT_FILENO, (off_t) -1, false);
+
         loop_remove(loop_nr, &image_fd);
 
         if (remove_subvol && arg_directory) {

commit 7391cb5d581c4d48dec689686fd9514fdb7d4888
Merge: 07d2102 c83f1f3
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jun 17 20:41:30 2015 +0200

    Merge pull request #44 from filbranden/unquote_first_word1
    
    Replace FOREACH_WORD_QUOTED with a loop using unquote_first_word in config_parse_exec()


commit 98d2a5341788b49e82d628dfdc2e241af6d70dcd
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jun 17 20:37:19 2015 +0200

    journal: ensure test-journal-stream doesn't get confused by crappy clocks
    
    This ensures that we write strictly monotonic timestamps into the
    journal files, to ensure that we can properly interleave everything
    correctly.
    
    See #175 for details.

diff --git a/src/journal/test-journal-stream.c b/src/journal/test-journal-stream.c
index e1146c6..b5ecf2f 100644
--- a/src/journal/test-journal-stream.c
+++ b/src/journal/test-journal-stream.c
@@ -80,6 +80,7 @@ int main(int argc, char *argv[]) {
         char *z;
         const void *data;
         size_t l;
+        dual_timestamp previous_ts = DUAL_TIMESTAMP_NULL;
 
         /* journal_file_open requires a valid machine id */
         if (access("/etc/machine-id", F_OK) != 0)
@@ -101,6 +102,14 @@ int main(int argc, char *argv[]) {
 
                 dual_timestamp_get(&ts);
 
+                if (ts.monotonic <= previous_ts.monotonic)
+                        ts.monotonic = previous_ts.monotonic + 1;
+
+                if (ts.realtime <= previous_ts.realtime)
+                        ts.realtime = previous_ts.realtime + 1;
+
+                previous_ts = ts;
+
                 assert_se(asprintf(&p, "NUMBER=%u", i) >= 0);
                 iovec[0].iov_base = p;
                 iovec[0].iov_len = strlen(p);

commit 118786182b8eafb55588e726fe6914290ef6c05f
Author: Thomas Hindoe Paaboel Andersen <phomes at gmail.com>
Date:   Wed Jun 17 20:29:41 2015 +0200

    udved: remove dead code
    
    Leftover from 6af5e6a4c918a68b196a04346732e094e5373a36

diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index 11f1f63..c205f1d 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -436,7 +436,6 @@ static void worker_spawn(Manager *manager, struct event *event) {
                                         if (fd_lock >= 0 && flock(fd_lock, LOCK_SH|LOCK_NB) < 0) {
                                                 log_debug_errno(errno, "Unable to flock(%s), skipping event handling: %m", udev_device_get_devnode(d));
                                                 fd_lock = safe_close(fd_lock);
-                                                r = -EAGAIN;
                                                 goto skip;
                                         }
                                 }

commit 07d210255b629ea97f9dc77c0fadcbc1c02be12c
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jun 17 20:28:20 2015 +0200

    logs-show: print a debug message when we skip entries without MESSAGE= fields

diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
index ac5eb16..068da46 100644
--- a/src/shared/logs-show.c
+++ b/src/shared/logs-show.c
@@ -274,8 +274,10 @@ static int output_short(
         if (r < 0)
                 return log_error_errno(r, "Failed to get journal fields: %m");
 
-        if (!message)
+        if (!message) {
+                log_debug("Skipping message without MESSAGE= field.");
                 return 0;
+        }
 
         if (!(flags & OUTPUT_SHOW_ALL))
                 strip_tab_ansi(&message, &message_len);

commit c83f1f30b80253de8a1a6034e7b016fa55d24523
Author: Filipe Brandenburger <filbranden at google.com>
Date:   Fri Jun 5 23:12:25 2015 -0700

    load-fragment: reset the list on an ExecStart= containing only whitespace
    
    This is consistent with how an empty string works in an ExecStart=
    statement.  We should not differentiate between an empty string and
    whitespace only (since they look the same.)
    
    Update the test case with whitespace only to reflect that the list is
    reset.
    
    Tested that `test-unit-file` passes and other test cases are not
    affected.  Installed the patched systemd binaries on a machine, booted
    it, looked for out of the usual behavior but did not find any.

diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index 41ba4c7..a48cb40 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -532,17 +532,15 @@ int config_parse_exec(
 
         e += ltype;
 
-        /* FIXME: ExecStart=<empty> clears the list, but ExecStart=<whitespace>
-         * doesn't, they should behave the same.  */
+        rvalue += strspn(rvalue, WHITESPACE);
+        p = rvalue;
+
         if (isempty(rvalue)) {
                 /* An empty assignment resets the list */
                 *e = exec_command_free_list(*e);
                 return 0;
         }
 
-        rvalue += strspn(rvalue, WHITESPACE);
-        p = rvalue;
-
         do {
                 int i;
                 _cleanup_strv_free_ char **n = NULL;
diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c
index c7e8353..8358789 100644
--- a/src/test/test-unit-file.c
+++ b/src/test/test-unit-file.c
@@ -145,19 +145,19 @@ static void test_config_parse_exec(void) {
         assert_se(r == 0);
         assert_se(c1->command_next == NULL);
 
-        log_info("/* no command, check for bad memory access */");
+        log_info("/* no command, whitespace only, reset */");
         r = config_parse_exec(NULL, "fake", 3, "section", 1,
                               "LValue", 0, "    ",
                               &c, NULL);
         assert_se(r == 0);
-        assert_se(c1->command_next == NULL);
+        assert_se(c == NULL);
 
         log_info("/* ignore && honour_argv0 */");
         r = config_parse_exec(NULL, "fake", 4, "section", 1,
                               "LValue", 0, "-@/RValue///slashes3 argv0a r1",
                               &c, NULL);
         assert_se(r >= 0);
-        c1 = c1->command_next;
+        c1 = c;
         check_execcommand(c1, "/RValue/slashes3", "argv0a", "r1", NULL, true);
 
         log_info("/* ignore && honour_argv0 */");

commit 46a0d98ac0fb5b507a6423e60058a2483830b432
Author: Filipe Brandenburger <filbranden at google.com>
Date:   Sat May 30 22:48:52 2015 -0700

    load-fragment: use unquote_first_word in config_parse_exec
    
    Convert config_parse_exec() from using FOREACH_WORD_QUOTED into a loop
    of unquote_first_word.
    
    Loop through the arguments only once (the FOREACH_WORD_QUOTED
    implementation did it twice, once to count them and another time to
    process and store them.)
    
    Use newly introduced flag UNQUOTE_UNESCAPE_RELAX to preserve
    unrecognized escape sequences such as regexps matches such as "\w",
    "\d", etc. (Valid escape sequences such as "\s" or "\b" still need an
    extra backslash if literals are desired for regexps.)
    
    Differences in behavior:
    
    - Handle ; (command separator) in special, so that only ; on its own is
      valid for that purpose, an quoted semicolon ";" or ';' will now behave
      as a literal semicolon.  This is probably what was initially intended.
    
    - Handle \; (to introduce a literal semicolon) in special, so that only \;
      is turned into a semicolon but not \\; or "\\;" or "\;" which are kept
      as a literal \; in the output.  This is probably what was initially
      intended.
    
    Known issues:
    
    - Using an empty string (for example, ExecStartPre=<empty>) will empty
      the list and remove the existing commands, but using whitespace only
      (for example, ExecStartPre=<spaces>) will not.  This is a pre-existing
      issue and will be dealt with in a follow up commit.
    
    Tested:
    
    - Unit tests passing.  Also `make distcheck` still works as expected.
    
    - Installed it on a local machine and booted with it, checked console
      output, systemctl and journalctl output, did not notice any issues
      running the patched systemd binaries.
    
    Relevant bug: https://bugs.freedesktop.org/show_bug.cgi?id=90794

diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index df5fe6f..41ba4c7 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -520,9 +520,9 @@ int config_parse_exec(
                 void *data,
                 void *userdata) {
 
-        ExecCommand **e = data, *nce;
-        char *path, **n;
-        unsigned k;
+        ExecCommand **e = data;
+        const char *p;
+        bool semicolon;
         int r;
 
         assert(filename);
@@ -532,156 +532,156 @@ int config_parse_exec(
 
         e += ltype;
 
+        /* FIXME: ExecStart=<empty> clears the list, but ExecStart=<whitespace>
+         * doesn't, they should behave the same.  */
         if (isempty(rvalue)) {
                 /* An empty assignment resets the list */
                 *e = exec_command_free_list(*e);
                 return 0;
         }
 
-        /* We accept an absolute path as first argument, or
-         * alternatively an absolute prefixed with @ to allow
-         * overriding of argv[0]. */
-        for (;;) {
+        rvalue += strspn(rvalue, WHITESPACE);
+        p = rvalue;
+
+        do {
                 int i;
-                const char *word, *state, *reason;
-                size_t l;
+                _cleanup_strv_free_ char **n = NULL;
+                size_t nlen = 0, nbufsize = 0;
+                _cleanup_free_ ExecCommand *nce = NULL;
+                _cleanup_free_ char *path = NULL, *firstword = NULL;
+                char *f;
                 bool separate_argv0 = false, ignore = false;
 
-                path = NULL;
-                nce = NULL;
-                n = NULL;
+                semicolon = false;
 
-                rvalue += strspn(rvalue, WHITESPACE);
+                r = unquote_first_word_and_warn(&p, &firstword, UNQUOTE_CUNESCAPE, unit, filename, line, rvalue);
+                if (r <= 0)
+                        return 0;
 
-                if (rvalue[0] == 0)
-                        break;
+                f = firstword;
+                for (i = 0; i < 2; i++) {
+                        /* We accept an absolute path as first argument, or
+                         * alternatively an absolute prefixed with @ to allow
+                         * overriding of argv[0]. */
+                        if (*f == '-' && !ignore)
+                                ignore = true;
+                        else if (*f == '@' && !separate_argv0)
+                                separate_argv0 = true;
+                        else
+                                break;
+                        f ++;
+                }
 
-                k = 0;
-                FOREACH_WORD_QUOTED(word, l, rvalue, state) {
-                        if (k == 0) {
-                                for (i = 0; i < 2; i++) {
-                                        if (*word == '-' && !ignore) {
-                                                ignore = true;
-                                                word ++;
-                                        }
-
-                                        if (*word == '@' && !separate_argv0) {
-                                                separate_argv0 = true;
-                                                word ++;
-                                        }
-                                }
-                        } else if (strneq(word, ";", MAX(l, 1U)))
-                                goto found;
+                if (isempty(f)) {
+                        /* First word is either "-" or "@" with no command. */
+                        log_syntax(unit, LOG_ERR, filename, line, EINVAL,
+                                   "Empty path in command line, ignoring: \"%s\"", rvalue);
+                        return 0;
+                }
 
-                        k++;
+                if (!string_is_safe(f)) {
+                        log_syntax(unit, LOG_ERR, filename, line, EINVAL,
+                                        "Executable path contains special characters, ignoring: %s", rvalue);
+                        return 0;
                 }
-                if (!isempty(state)) {
-                        log_syntax(unit, LOG_ERR, filename, line, EINVAL, "Trailing garbage, ignoring.");
+                if (!path_is_absolute(f)) {
+                        log_syntax(unit, LOG_ERR, filename, line, EINVAL,
+                                        "Executable path is not absolute, ignoring: %s", rvalue);
+                        return 0;
+                }
+                if (endswith(f, "/")) {
+                        log_syntax(unit, LOG_ERR, filename, line, EINVAL,
+                                        "Executable path specifies a directory, ignoring: %s", rvalue);
                         return 0;
                 }
 
-        found:
-                /* If separate_argv0, we'll move first element to path variable */
-                n = new(char*, MAX(k + !separate_argv0, 1u));
-                if (!n)
-                        return log_oom();
+                if (f == firstword) {
+                        path = firstword;
+                        firstword = NULL;
+                } else {
+                        path = strdup(f);
+                        if (!path)
+                                return log_oom();
+                }
 
-                k = 0;
-                FOREACH_WORD_QUOTED(word, l, rvalue, state) {
-                        char *c;
-                        unsigned skip;
-
-                        if (separate_argv0 ? path == NULL : k == 0) {
-                                /* first word, very special */
-                                skip = separate_argv0 + ignore;
-
-                                /* skip special chars in the beginning */
-                                if (l <= skip) {
-                                        log_syntax(unit, LOG_ERR, filename, line, EINVAL,
-                                                   "Empty path in command line, ignoring: \"%s\"", rvalue);
-                                        r = 0;
-                                        goto fail;
-                                }
+                if (!separate_argv0) {
+                        if (!GREEDY_REALLOC(n, nbufsize, nlen + 2))
+                                return log_oom();
+                        f = strdup(path);
+                        if (!f)
+                                return log_oom();
+                        n[nlen++] = f;
+                        n[nlen] = NULL;
+                }
 
-                        } else if (strneq(word, ";", MAX(l, 1U)))
-                                /* new commandline */
-                                break;
+                path_kill_slashes(path);
 
-                        else
-                                skip = strneq(word, "\\;", MAX(l, 1U));
+                for (;;) {
+                        _cleanup_free_ char *word = NULL;
 
-                        r = cunescape_length(word + skip, l - skip, UNESCAPE_RELAX, &c);
-                        if (r < 0) {
-                                log_syntax(unit, LOG_ERR, filename, line, r, "Failed to unescape command line, ignoring: %s", rvalue);
-                                r = 0;
-                                goto fail;
+                        /* Check explicitly for an unquoted semicolon as
+                         * command separator token.  */
+                        if (p[0] == ';' && (!p[1] || strchr(WHITESPACE, p[1]))) {
+                                p ++;
+                                p += strspn(p, WHITESPACE);
+                                semicolon = true;
+                                break;
                         }
 
-                        if (!utf8_is_valid(c)) {
-                                log_invalid_utf8(unit, LOG_ERR, filename, line, EINVAL, rvalue);
-                                r = 0;
-                                goto fail;
+                        /* Check for \; explicitly, to not confuse it with \\;
+                         * or "\;" or "\\;" etc.  unquote_first_word would
+                         * return the same for all of those.  */
+                        if (p[0] == '\\' && p[1] == ';' && (!p[2] || strchr(WHITESPACE, p[2]))) {
+                                p += 2;
+                                p += strspn(p, WHITESPACE);
+                                if (!GREEDY_REALLOC(n, nbufsize, nlen + 2))
+                                        return log_oom();
+                                f = strdup(";");
+                                if (!f)
+                                        return log_oom();
+                                n[nlen++] = f;
+                                n[nlen] = NULL;
+                                continue;
                         }
 
-                        /* where to stuff this? */
-                        if (separate_argv0 && path == NULL)
-                                path = c;
-                        else
-                                n[k++] = c;
-                }
+                        r = unquote_first_word_and_warn(&p, &word, UNQUOTE_CUNESCAPE, unit, filename, line, rvalue);
+                        if (r == 0)
+                                break;
+                        else if (r < 0)
+                                return 0;
 
-                n[k] = NULL;
+                        if (!GREEDY_REALLOC(n, nbufsize, nlen + 2))
+                                return log_oom();
+                        n[nlen++] = word;
+                        n[nlen] = NULL;
+                        word = NULL;
+                }
 
-                if (!n[0])
-                        reason = "Empty executable name or zeroeth argument";
-                else if (!string_is_safe(path ?: n[0]))
-                        reason = "Executable path contains special characters";
-                else if (!path_is_absolute(path ?: n[0]))
-                        reason = "Executable path is not absolute";
-                else if (endswith(path ?: n[0], "/"))
-                        reason = "Executable path specifies a directory";
-                else
-                        goto ok;
-
-                log_syntax(unit, LOG_ERR, filename, line, EINVAL, "%s, ignoring: %s", reason, rvalue);
-                r = 0;
-                goto fail;
-
-ok:
-                if (!path) {
-                        path = strdup(n[0]);
-                        if (!path) {
-                                r = log_oom();
-                                goto fail;
-                        }
+                if (!n || !n[0]) {
+                        log_syntax(unit, LOG_ERR, filename, line, EINVAL,
+                                        "Empty executable name or zeroeth argument, ignoring: %s", rvalue);
+                        return 0;
                 }
 
                 nce = new0(ExecCommand, 1);
-                if (!nce) {
-                        r = log_oom();
-                        goto fail;
-                }
+                if (!nce)
+                        return log_oom();
 
                 nce->argv = n;
                 nce->path = path;
                 nce->ignore = ignore;
 
-                path_kill_slashes(nce->path);
-
                 exec_command_append_list(e, nce);
 
-                rvalue = state;
-        }
-
-        return 0;
+                /* Do not _cleanup_free_ these. */
+                n = NULL;
+                path = NULL;
+                nce = NULL;
 
-fail:
-        n[k] = NULL;
-        strv_free(n);
-        free(path);
-        free(nce);
+                rvalue = p;
+        } while (semicolon);
 
-        return r;
+        return 0;
 }
 
 DEFINE_CONFIG_PARSE_ENUM(config_parse_service_type, service_type, ServiceType, "Failed to parse service type");
diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c
index 892b65d..c7e8353 100644
--- a/src/test/test-unit-file.c
+++ b/src/test/test-unit-file.c
@@ -237,7 +237,7 @@ static void test_config_parse_exec(void) {
                               &c, NULL);
         assert_se(r >= 0);
         c1 = c1->command_next;
-        check_execcommand(c1, "/RValue", "argv0", "r1", NULL, true);
+        check_execcommand(c1, "/RValue", "argv0", "r1", ";", true);
 
         log_info("/* escaped semicolon */");
         r = config_parse_exec(NULL, "fake", 5, "section", 1,
@@ -284,7 +284,7 @@ static void test_config_parse_exec(void) {
                               &c, NULL);
         assert_se(r >= 0);
         c1 = c1->command_next;
-        check_execcommand(c1, "/bin/find", NULL, NULL, NULL, false);
+        check_execcommand(c1, "/bin/find", NULL, ";", NULL, false);
 
         log_info("/* quoted semicolon with following arg */");
         r = config_parse_exec(NULL, "fake", 5, "section", 1,
@@ -294,11 +294,7 @@ static void test_config_parse_exec(void) {
         assert_se(r >= 0);
         c1 = c1->command_next;
         check_execcommand(c1,
-                          "/sbin/find", NULL, NULL, NULL, false);
-
-        c1 = c1->command_next;
-        check_execcommand(c1,
-                          "/x", NULL, NULL, NULL, false);
+                          "/sbin/find", NULL, ";", "/x", false);
 
         log_info("/* spaces in the filename */");
         r = config_parse_exec(NULL, "fake", 5, "section", 1,

commit 0e9800d5d938acb350b2a3a29b938bc1deed0313
Author: Filipe Brandenburger <filbranden at google.com>
Date:   Mon Jun 8 22:01:52 2015 -0700

    tests: additional cases in test-unit-file
    
    These tests will be useful to check the cases regarding quoted and
    escaped semicolon when we switch to using unquote_first_word.
    
    Additionally, convert some of the tests that have semicolons so that the
    argument after the semicolon looks like a path (starts with /) so that
    we can see the change of behavior when making config_parse_exec more
    strict about what it accepts as a command separator.

diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c
index a8025c8..892b65d 100644
--- a/src/test/test-unit-file.c
+++ b/src/test/test-unit-file.c
@@ -195,6 +195,19 @@ static void test_config_parse_exec(void) {
         c1 = c1->command_next;
         check_execcommand(c1, "/goo/goo", NULL, "boo", NULL, false);
 
+        log_info("/* two semicolons in a row */");
+        r = config_parse_exec(NULL, "fake", 5, "section", 1,
+                              "LValue", 0,
+                              "-@/RValue argv0 r1 ; ; "
+                              "/goo/goo boo",
+                              &c, NULL);
+        assert_se(r >= 0);
+        c1 = c1->command_next;
+        check_execcommand(c1, "/RValue", "argv0", "r1", NULL, true);
+
+        /* second command fails because the executable name is ";" */
+        assert_se(c1->command_next == NULL);
+
         log_info("/* trailing semicolon */");
         r = config_parse_exec(NULL, "fake", 5, "section", 1,
                               "LValue", 0,
@@ -206,6 +219,26 @@ static void test_config_parse_exec(void) {
 
         assert_se(c1->command_next == NULL);
 
+        log_info("/* trailing semicolon, no whitespace */");
+        r = config_parse_exec(NULL, "fake", 5, "section", 1,
+                              "LValue", 0,
+                              "-@/RValue argv0 r1 ;",
+                              &c, NULL);
+        assert_se(r >= 0);
+        c1 = c1->command_next;
+        check_execcommand(c1, "/RValue", "argv0", "r1", NULL, true);
+
+        assert_se(c1->command_next == NULL);
+
+        log_info("/* trailing semicolon in single quotes */");
+        r = config_parse_exec(NULL, "fake", 5, "section", 1,
+                              "LValue", 0,
+                              "-@/RValue argv0 r1 ';'",
+                              &c, NULL);
+        assert_se(r >= 0);
+        c1 = c1->command_next;
+        check_execcommand(c1, "/RValue", "argv0", "r1", NULL, true);
+
         log_info("/* escaped semicolon */");
         r = config_parse_exec(NULL, "fake", 5, "section", 1,
                               "LValue", 0,
@@ -218,12 +251,22 @@ static void test_config_parse_exec(void) {
         log_info("/* escaped semicolon with following arg */");
         r = config_parse_exec(NULL, "fake", 5, "section", 1,
                               "LValue", 0,
-                              "/sbin/find \\; x",
+                              "/sbin/find \\; /x",
+                              &c, NULL);
+        assert_se(r >= 0);
+        c1 = c1->command_next;
+        check_execcommand(c1,
+                          "/sbin/find", NULL, ";", "/x", false);
+
+        log_info("/* escaped semicolon as part of an expression */");
+        r = config_parse_exec(NULL, "fake", 5, "section", 1,
+                              "LValue", 0,
+                              "/sbin/find \\;x",
                               &c, NULL);
         assert_se(r >= 0);
         c1 = c1->command_next;
         check_execcommand(c1,
-                          "/sbin/find", NULL, ";", "x", false);
+                          "/sbin/find", NULL, "\\;x", NULL, false);
 
         log_info("/* encoded semicolon */");
         r = config_parse_exec(NULL, "fake", 5, "section", 1,
@@ -234,6 +277,29 @@ static void test_config_parse_exec(void) {
         c1 = c1->command_next;
         check_execcommand(c1, "/bin/find", NULL, ";", NULL, false);
 
+        log_info("/* quoted semicolon */");
+        r = config_parse_exec(NULL, "fake", 5, "section", 1,
+                              "LValue", 0,
+                              "/bin/find \";\"",
+                              &c, NULL);
+        assert_se(r >= 0);
+        c1 = c1->command_next;
+        check_execcommand(c1, "/bin/find", NULL, NULL, NULL, false);
+
+        log_info("/* quoted semicolon with following arg */");
+        r = config_parse_exec(NULL, "fake", 5, "section", 1,
+                              "LValue", 0,
+                              "/sbin/find \";\" /x",
+                              &c, NULL);
+        assert_se(r >= 0);
+        c1 = c1->command_next;
+        check_execcommand(c1,
+                          "/sbin/find", NULL, NULL, NULL, false);
+
+        c1 = c1->command_next;
+        check_execcommand(c1,
+                          "/x", NULL, NULL, NULL, false);
+
         log_info("/* spaces in the filename */");
         r = config_parse_exec(NULL, "fake", 5, "section", 1,
                               "LValue", 0,

commit b59292b296ad71a20a40d7c347b6ca71df48892d
Author: Filipe Brandenburger <filbranden at google.com>
Date:   Mon Jun 8 21:31:43 2015 -0700

    util: Introduce unquote_first_word_and_warn
    
    It will try to unquot_first_word, but if it runs into escaping problems
    it will retry it adding UNQUOTE_CUNESCAPE_RELAX to the flags.  If it
    succeeds on the second try, it will log a warning about it.  If it fails
    both times, it will log an error.
    
    Add test cases to confirm it behaves as expected.

diff --git a/src/basic/util.c b/src/basic/util.c
index 46a48c4..727be56 100644
--- a/src/basic/util.c
+++ b/src/basic/util.c
@@ -5320,6 +5320,36 @@ finish:
         return 1;
 }
 
+int unquote_first_word_and_warn(
+                const char **p,
+                char **ret,
+                UnquoteFlags flags,
+                const char *unit,
+                const char *filename,
+                unsigned line,
+                const char *rvalue) {
+        /* Try to unquote it, if it fails, warn about it and try again but this
+         * time using UNQUOTE_CUNESCAPE_RELAX to keep the backslashes verbatim
+         * in invalid escape sequences. */
+        const char *save;
+        int r;
+
+        save = *p;
+        r = unquote_first_word(p, ret, flags);
+        if (r < 0 && !(flags&UNQUOTE_CUNESCAPE_RELAX)) {
+                /* Retry it with UNQUOTE_CUNESCAPE_RELAX. */
+                *p = save;
+                r = unquote_first_word(p, ret, flags|UNQUOTE_CUNESCAPE_RELAX);
+                if (r < 0)
+                        log_syntax(unit, LOG_ERR, filename, line, EINVAL,
+                                   "Unbalanced quoting in command line, ignoring: \"%s\"", rvalue);
+                else
+                        log_syntax(unit, LOG_WARNING, filename, line, EINVAL,
+                                   "Invalid escape sequences in command line: \"%s\"", rvalue);
+        }
+        return r;
+}
+
 int unquote_many_words(const char **p, UnquoteFlags flags, ...) {
         va_list ap;
         char **l;
diff --git a/src/basic/util.h b/src/basic/util.h
index 748f22f..a1d1dd1 100644
--- a/src/basic/util.h
+++ b/src/basic/util.h
@@ -845,6 +845,7 @@ typedef enum UnquoteFlags {
 } UnquoteFlags;
 
 int unquote_first_word(const char **p, char **ret, UnquoteFlags flags);
+int unquote_first_word_and_warn(const char **p, char **ret, UnquoteFlags flags, const char *unit, const char *filename, unsigned line, const char *rvalue);
 int unquote_many_words(const char **p, UnquoteFlags flags, ...) _sentinel_;
 
 int free_and_strdup(char **p, const char *s);
diff --git a/src/test/test-util.c b/src/test/test-util.c
index b3e79cd..ad9ea3b 100644
--- a/src/test/test-util.c
+++ b/src/test/test-util.c
@@ -1400,6 +1400,150 @@ static void test_unquote_first_word(void) {
         assert_se(p == original + 5);
 }
 
+static void test_unquote_first_word_and_warn(void) {
+        const char *p, *original;
+        char *t;
+
+        p = original = "foobar waldo";
+        assert_se(unquote_first_word_and_warn(&p, &t, 0, NULL, "fake", 1, original) > 0);
+        assert_se(streq(t, "foobar"));
+        free(t);
+        assert_se(p == original + 7);
+
+        assert_se(unquote_first_word_and_warn(&p, &t, 0, NULL, "fake", 1, original) > 0);
+        assert_se(streq(t, "waldo"));
+        free(t);
+        assert_se(p == original + 12);
+
+        assert_se(unquote_first_word_and_warn(&p, &t, 0, NULL, "fake", 1, original) == 0);
+        assert_se(!t);
+        assert_se(p == original + 12);
+
+        p = original = "\"foobar\" \'waldo\'";
+        assert_se(unquote_first_word_and_warn(&p, &t, 0, NULL, "fake", 1, original) > 0);
+        assert_se(streq(t, "foobar"));
+        free(t);
+        assert_se(p == original + 9);
+
+        assert_se(unquote_first_word_and_warn(&p, &t, 0, NULL, "fake", 1, original) > 0);
+        assert_se(streq(t, "waldo"));
+        free(t);
+        assert_se(p == original + 16);
+
+        assert_se(unquote_first_word_and_warn(&p, &t, 0, NULL, "fake", 1, original) == 0);
+        assert_se(!t);
+        assert_se(p == original + 16);
+
+        p = original = "\"";
+        assert_se(unquote_first_word_and_warn(&p, &t, 0, NULL, "fake", 1, original) == -EINVAL);
+        assert_se(p == original + 1);
+
+        p = original = "\'";
+        assert_se(unquote_first_word_and_warn(&p, &t, 0, NULL, "fake", 1, original) == -EINVAL);
+        assert_se(p == original + 1);
+
+        p = original = "\'fooo";
+        assert_se(unquote_first_word_and_warn(&p, &t, 0, NULL, "fake", 1, original) == -EINVAL);
+        assert_se(p == original + 5);
+
+        p = original = "\'fooo";
+        assert_se(unquote_first_word_and_warn(&p, &t, UNQUOTE_RELAX, NULL, "fake", 1, original) > 0);
+        assert_se(streq(t, "fooo"));
+        free(t);
+        assert_se(p == original + 5);
+
+        p = original = " foo\\ba\\x6ar ";
+        assert_se(unquote_first_word_and_warn(&p, &t, UNQUOTE_CUNESCAPE, NULL, "fake", 1, original) > 0);
+        assert_se(streq(t, "foo\ba\x6ar"));
+        free(t);
+        assert_se(p == original + 13);
+
+        p = original = " foo\\ba\\x6ar ";
+        assert_se(unquote_first_word_and_warn(&p, &t, 0, NULL, "fake", 1, original) > 0);
+        assert_se(streq(t, "foobax6ar"));
+        free(t);
+        assert_se(p == original + 13);
+
+        p = original = "    f\\u00f6o \"pi\\U0001F4A9le\"   ";
+        assert_se(unquote_first_word_and_warn(&p, &t, UNQUOTE_CUNESCAPE, NULL, "fake", 1, original) > 0);
+        assert_se(streq(t, "föo"));
+        free(t);
+        assert_se(p == original + 13);
+
+        assert_se(unquote_first_word_and_warn(&p, &t, UNQUOTE_CUNESCAPE, NULL, "fake", 1, original) > 0);
+        assert_se(streq(t, "pi\360\237\222\251le"));
+        free(t);
+        assert_se(p == original + 32);
+
+        p = original = "fooo\\";
+        assert_se(unquote_first_word_and_warn(&p, &t, UNQUOTE_RELAX, NULL, "fake", 1, original) > 0);
+        assert_se(streq(t, "fooo"));
+        free(t);
+        assert_se(p == original + 5);
+
+        p = original = "fooo\\";
+        assert_se(unquote_first_word_and_warn(&p, &t, 0, NULL, "fake", 1, original) > 0);
+        assert_se(streq(t, "fooo\\"));
+        free(t);
+        assert_se(p == original + 5);
+
+        p = original = "fooo\\";
+        assert_se(unquote_first_word_and_warn(&p, &t, UNQUOTE_CUNESCAPE, NULL, "fake", 1, original) > 0);
+        assert_se(streq(t, "fooo\\"));
+        free(t);
+        assert_se(p == original + 5);
+
+        p = original = "\"foo\\";
+        assert_se(unquote_first_word_and_warn(&p, &t, 0, NULL, "fake", 1, original) == -EINVAL);
+        assert_se(p == original + 5);
+
+        p = original = "\"foo\\";
+        assert_se(unquote_first_word_and_warn(&p, &t, UNQUOTE_RELAX, NULL, "fake", 1, original) > 0);
+        assert_se(streq(t, "foo"));
+        free(t);
+        assert_se(p == original + 5);
+
+        p = original = "\"foo\\";
+        assert_se(unquote_first_word_and_warn(&p, &t, UNQUOTE_CUNESCAPE, NULL, "fake", 1, original) == -EINVAL);
+        assert_se(p == original + 5);
+
+        p = original = "\"foo\\";
+        assert_se(unquote_first_word_and_warn(&p, &t, UNQUOTE_CUNESCAPE|UNQUOTE_RELAX, NULL, "fake", 1, original) > 0);
+        assert_se(streq(t, "foo"));
+        free(t);
+        assert_se(p == original + 5);
+
+        p = original = "fooo\\ bar quux";
+        assert_se(unquote_first_word_and_warn(&p, &t, UNQUOTE_RELAX, NULL, "fake", 1, original) > 0);
+        assert_se(streq(t, "fooo bar"));
+        free(t);
+        assert_se(p == original + 10);
+
+        p = original = "fooo\\ bar quux";
+        assert_se(unquote_first_word_and_warn(&p, &t, 0, NULL, "fake", 1, original) > 0);
+        assert_se(streq(t, "fooo bar"));
+        free(t);
+        assert_se(p == original + 10);
+
+        p = original = "fooo\\ bar quux";
+        assert_se(unquote_first_word_and_warn(&p, &t, UNQUOTE_CUNESCAPE, NULL, "fake", 1, original) > 0);
+        assert_se(streq(t, "fooo\\ bar"));
+        free(t);
+        assert_se(p == original + 10);
+
+        p = original = "\\w+@\\K[\\d.]+";
+        assert_se(unquote_first_word_and_warn(&p, &t, UNQUOTE_CUNESCAPE, NULL, "fake", 1, original) > 0);
+        assert_se(streq(t, "\\w+@\\K[\\d.]+"));
+        free(t);
+        assert_se(p == original + 12);
+
+        p = original = "\\w+\\b";
+        assert_se(unquote_first_word_and_warn(&p, &t, UNQUOTE_CUNESCAPE, NULL, "fake", 1, original) > 0);
+        assert_se(streq(t, "\\w+\b"));
+        free(t);
+        assert_se(p == original + 5);
+}
+
 static void test_unquote_many_words(void) {
         const char *p, *original;
         char *a, *b, *c;
@@ -1704,6 +1848,7 @@ int main(int argc, char *argv[]) {
         test_glob_exists();
         test_execute_directory();
         test_unquote_first_word();
+        test_unquote_first_word_and_warn();
         test_unquote_many_words();
         test_parse_proc_cmdline();
         test_raw_clone();

commit d6293c070e6e4b83d8e7ec56e465b0b215d55d98
Author: Filipe Brandenburger <filbranden at google.com>
Date:   Tue Jun 2 21:08:24 2015 -0700

    util: New flag UNQUOTE_UNESCAPE_RELAX for unquote_first_word
    
    The new flag UNQUOTE_UNESCAPE_RELAX preserves unrecognized escape
    sequences verbatim in unquote_first_word, either when it's a trailing
    backslash (similar to UNQUOTE_RELAX, but in this case keep the extra
    backslash in the output) or in the middle of a sequence string.
    
    Add unit test cases to ensure the new flag works as expected and to
    prevent regressions from being introduced.
    
    Tested with a follow up commit converting config_parse_exec() to start
    using unquote_first_word, in which case this flags makes it possible to
    preserve unrecognized escape sequences.
    
    Relevant bug: https://bugs.freedesktop.org/show_bug.cgi?id=90794

diff --git a/src/basic/util.c b/src/basic/util.c
index e0d1220..46a48c4 100644
--- a/src/basic/util.c
+++ b/src/basic/util.c
@@ -5246,21 +5246,39 @@ int unquote_first_word(const char **p, char **ret, UnquoteFlags flags) {
                 case SINGLE_QUOTE_ESCAPE:
                 case DOUBLE_QUOTE_ESCAPE:
                 case VALUE_ESCAPE:
+                        if (!GREEDY_REALLOC(s, allocated, sz+7))
+                                return -ENOMEM;
+
                         if (c == 0) {
+                                if ((flags & UNQUOTE_CUNESCAPE_RELAX) &&
+                                    (state == VALUE_ESCAPE || flags & UNQUOTE_RELAX)) {
+                                        /* If we find an unquoted trailing backslash and we're in
+                                         * UNQUOTE_CUNESCAPE_RELAX mode, keep it verbatim in the
+                                         * output.
+                                         *
+                                         * Unbalanced quotes will only be allowed in UNQUOTE_RELAX
+                                         * mode, UNQUOTE_CUNESCAP_RELAX mode does not allow them.
+                                         */
+                                        s[sz++] = '\\';
+                                        goto finish;
+                                }
                                 if (flags & UNQUOTE_RELAX)
                                         goto finish;
                                 return -EINVAL;
                         }
 
-                        if (!GREEDY_REALLOC(s, allocated, sz+7))
-                                return -ENOMEM;
-
                         if (flags & UNQUOTE_CUNESCAPE) {
                                 uint32_t u;
 
                                 r = cunescape_one(*p, (size_t) -1, &c, &u);
-                                if (r < 0)
+                                if (r < 0) {
+                                        if (flags & UNQUOTE_CUNESCAPE_RELAX) {
+                                                s[sz++] = '\\';
+                                                s[sz++] = c;
+                                                goto end_escape;
+                                        }
                                         return -EINVAL;
+                                }
 
                                 (*p) += r - 1;
 
@@ -5271,6 +5289,7 @@ int unquote_first_word(const char **p, char **ret, UnquoteFlags flags) {
                         } else
                                 s[sz++] = c;
 
+end_escape:
                         state = (state == SINGLE_QUOTE_ESCAPE) ? SINGLE_QUOTE :
                                 (state == DOUBLE_QUOTE_ESCAPE) ? DOUBLE_QUOTE :
                                 VALUE;
diff --git a/src/basic/util.h b/src/basic/util.h
index 7aca46d..748f22f 100644
--- a/src/basic/util.h
+++ b/src/basic/util.h
@@ -839,8 +839,9 @@ int is_dir(const char *path, bool follow);
 int is_device_node(const char *path);
 
 typedef enum UnquoteFlags {
-        UNQUOTE_RELAX     = 1,
-        UNQUOTE_CUNESCAPE = 2,
+        UNQUOTE_RELAX           = 1,
+        UNQUOTE_CUNESCAPE       = 2,
+        UNQUOTE_CUNESCAPE_RELAX = 4,
 } UnquoteFlags;
 
 int unquote_first_word(const char **p, char **ret, UnquoteFlags flags);
diff --git a/src/test/test-util.c b/src/test/test-util.c
index ed8db45..b3e79cd 100644
--- a/src/test/test-util.c
+++ b/src/test/test-util.c
@@ -1304,6 +1304,100 @@ static void test_unquote_first_word(void) {
         assert_se(streq(t, "pi\360\237\222\251le"));
         free(t);
         assert_se(p == original + 32);
+
+        p = original = "fooo\\";
+        assert_se(unquote_first_word(&p, &t, UNQUOTE_RELAX) > 0);
+        assert_se(streq(t, "fooo"));
+        free(t);
+        assert_se(p == original + 5);
+
+        p = original = "fooo\\";
+        assert_se(unquote_first_word(&p, &t, UNQUOTE_CUNESCAPE_RELAX) > 0);
+        assert_se(streq(t, "fooo\\"));
+        free(t);
+        assert_se(p == original + 5);
+
+        p = original = "fooo\\";
+        assert_se(unquote_first_word(&p, &t, UNQUOTE_CUNESCAPE_RELAX|UNQUOTE_RELAX) > 0);
+        assert_se(streq(t, "fooo\\"));
+        free(t);
+        assert_se(p == original + 5);
+
+        p = original = "fooo\\";
+        assert_se(unquote_first_word(&p, &t, UNQUOTE_CUNESCAPE|UNQUOTE_CUNESCAPE_RELAX) > 0);
+        assert_se(streq(t, "fooo\\"));
+        free(t);
+        assert_se(p == original + 5);
+
+        p = original = "\"foo\\";
+        assert_se(unquote_first_word(&p, &t, 0) == -EINVAL);
+        assert_se(p == original + 5);
+
+        p = original = "\"foo\\";
+        assert_se(unquote_first_word(&p, &t, UNQUOTE_RELAX) > 0);
+        assert_se(streq(t, "foo"));
+        free(t);
+        assert_se(p == original + 5);
+
+        p = original = "\"foo\\";
+        assert_se(unquote_first_word(&p, &t, UNQUOTE_CUNESCAPE_RELAX) == -EINVAL);
+        assert_se(p == original + 5);
+
+        p = original = "\"foo\\";
+        assert_se(unquote_first_word(&p, &t, UNQUOTE_CUNESCAPE_RELAX|UNQUOTE_RELAX) > 0);
+        assert_se(streq(t, "foo\\"));
+        free(t);
+        assert_se(p == original + 5);
+
+        p = original = "\"foo\\";
+        assert_se(unquote_first_word(&p, &t, UNQUOTE_CUNESCAPE|UNQUOTE_CUNESCAPE_RELAX|UNQUOTE_RELAX) > 0);
+        assert_se(streq(t, "foo\\"));
+        free(t);
+        assert_se(p == original + 5);
+
+        p = original = "fooo\\ bar quux";
+        assert_se(unquote_first_word(&p, &t, UNQUOTE_RELAX) > 0);
+        assert_se(streq(t, "fooo bar"));
+        free(t);
+        assert_se(p == original + 10);
+
+        p = original = "fooo\\ bar quux";
+        assert_se(unquote_first_word(&p, &t, UNQUOTE_CUNESCAPE_RELAX) > 0);
+        assert_se(streq(t, "fooo bar"));
+        free(t);
+        assert_se(p == original + 10);
+
+        p = original = "fooo\\ bar quux";
+        assert_se(unquote_first_word(&p, &t, UNQUOTE_CUNESCAPE_RELAX|UNQUOTE_RELAX) > 0);
+        assert_se(streq(t, "fooo bar"));
+        free(t);
+        assert_se(p == original + 10);
+
+        p = original = "fooo\\ bar quux";
+        assert_se(unquote_first_word(&p, &t, UNQUOTE_CUNESCAPE) == -EINVAL);
+        assert_se(p == original + 5);
+
+        p = original = "fooo\\ bar quux";
+        assert_se(unquote_first_word(&p, &t, UNQUOTE_CUNESCAPE|UNQUOTE_CUNESCAPE_RELAX) > 0);
+        assert_se(streq(t, "fooo\\ bar"));
+        free(t);
+        assert_se(p == original + 10);
+
+        p = original = "\\w+@\\K[\\d.]+";
+        assert_se(unquote_first_word(&p, &t, UNQUOTE_CUNESCAPE) == -EINVAL);
+        assert_se(p == original + 1);
+
+        p = original = "\\w+@\\K[\\d.]+";
+        assert_se(unquote_first_word(&p, &t, UNQUOTE_CUNESCAPE|UNQUOTE_CUNESCAPE_RELAX) > 0);
+        assert_se(streq(t, "\\w+@\\K[\\d.]+"));
+        free(t);
+        assert_se(p == original + 12);
+
+        p = original = "\\w+\\b";
+        assert_se(unquote_first_word(&p, &t, UNQUOTE_CUNESCAPE|UNQUOTE_CUNESCAPE_RELAX) > 0);
+        assert_se(streq(t, "\\w+\b"));
+        free(t);
+        assert_se(p == original + 5);
 }
 
 static void test_unquote_many_words(void) {

commit 05654e712f0ccfea7bbeb3e4de89861a670f974e
Author: Filipe Brandenburger <filbranden at google.com>
Date:   Fri May 29 23:42:47 2015 -0700

    util: Refactor common cunescape block in unquote_first_word

diff --git a/src/basic/util.c b/src/basic/util.c
index e0c5069..e0d1220 100644
--- a/src/basic/util.c
+++ b/src/basic/util.c
@@ -5209,35 +5209,6 @@ int unquote_first_word(const char **p, char **ret, UnquoteFlags flags) {
 
                         break;
 
-                case VALUE_ESCAPE:
-                        if (c == 0) {
-                                if (flags & UNQUOTE_RELAX)
-                                        goto finish;
-                                return -EINVAL;
-                        }
-
-                        if (!GREEDY_REALLOC(s, allocated, sz+7))
-                                return -ENOMEM;
-
-                        if (flags & UNQUOTE_CUNESCAPE) {
-                                uint32_t u;
-
-                                r = cunescape_one(*p, (size_t) -1, &c, &u);
-                                if (r < 0)
-                                        return -EINVAL;
-
-                                (*p) += r - 1;
-
-                                if (c != 0)
-                                        s[sz++] = c; /* normal explicit char */
-                                else
-                                        sz += utf8_encode_unichar(s + sz, u); /* unicode chars we'll encode as utf8 */
-                        } else
-                                s[sz++] = c;
-
-                        state = VALUE;
-                        break;
-
                 case SINGLE_QUOTE:
                         if (c == 0) {
                                 if (flags & UNQUOTE_RELAX)
@@ -5256,35 +5227,6 @@ int unquote_first_word(const char **p, char **ret, UnquoteFlags flags) {
 
                         break;
 
-                case SINGLE_QUOTE_ESCAPE:
-                        if (c == 0) {
-                                if (flags & UNQUOTE_RELAX)
-                                        goto finish;
-                                return -EINVAL;
-                        }
-
-                        if (!GREEDY_REALLOC(s, allocated, sz+7))
-                                return -ENOMEM;
-
-                        if (flags & UNQUOTE_CUNESCAPE) {
-                                uint32_t u;
-
-                                r = cunescape_one(*p, (size_t) -1, &c, &u);
-                                if (r < 0)
-                                        return -EINVAL;
-
-                                (*p) += r - 1;
-
-                                if (c != 0)
-                                        s[sz++] = c;
-                                else
-                                        sz += utf8_encode_unichar(s + sz, u);
-                        } else
-                                s[sz++] = c;
-
-                        state = SINGLE_QUOTE;
-                        break;
-
                 case DOUBLE_QUOTE:
                         if (c == 0)
                                 return -EINVAL;
@@ -5301,7 +5243,9 @@ int unquote_first_word(const char **p, char **ret, UnquoteFlags flags) {
 
                         break;
 
+                case SINGLE_QUOTE_ESCAPE:
                 case DOUBLE_QUOTE_ESCAPE:
+                case VALUE_ESCAPE:
                         if (c == 0) {
                                 if (flags & UNQUOTE_RELAX)
                                         goto finish;
@@ -5321,13 +5265,15 @@ int unquote_first_word(const char **p, char **ret, UnquoteFlags flags) {
                                 (*p) += r - 1;
 
                                 if (c != 0)
-                                        s[sz++] = c;
+                                        s[sz++] = c; /* normal explicit char */
                                 else
-                                        sz += utf8_encode_unichar(s + sz, u);
+                                        sz += utf8_encode_unichar(s + sz, u); /* unicode chars we'll encode as utf8 */
                         } else
                                 s[sz++] = c;
 
-                        state = DOUBLE_QUOTE;
+                        state = (state == SINGLE_QUOTE_ESCAPE) ? SINGLE_QUOTE :
+                                (state == DOUBLE_QUOTE_ESCAPE) ? DOUBLE_QUOTE :
+                                VALUE;
                         break;
 
                 case SPACE:

commit b3d4ef81f6aaac3df8d15ad0d2e3f78b74c00d28
Merge: b0fc076 144c348
Author: Tom Gundersen <teg at jklm.no>
Date:   Wed Jun 17 20:04:17 2015 +0200

    Merge pull request #267 from phomes/master
    
    sd-dhcp-client: readd deleted error check


commit b0fc0763d38a0ad227c0f1d31662449696b13cf0
Merge: 9ee7a50 7116130
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jun 17 19:52:04 2015 +0200

    Merge pull request #265 from smcv/logind-runtimedir-race-write-earlier
    
    logind: save /run/systemd/users/UID before starting user at .service


commit 00dbd902e9d55694cfb7c143ab54e8c08484d28e
Author: Tom Gundersen <teg at jklm.no>
Date:   Wed Jun 17 19:48:15 2015 +0200

    man: libudev - add description to udev_device_*

diff --git a/man/udev_device_new_from_syspath.xml b/man/udev_device_new_from_syspath.xml
index c3c0d76..fc147a8 100644
--- a/man/udev_device_new_from_syspath.xml
+++ b/man/udev_device_new_from_syspath.xml
@@ -106,11 +106,52 @@
     </funcsynopsis>
   </refsynopsisdiv>
 
-  <!--<refsect1>
+  <refsect1>
     <title>Description</title>
 
-    <para>XXX: Add some description.</para>
-  </refsect1>-->
+    <para><function>udev_device_new_from_syspath</function>,
+    <function>udev_device_new_from_devnum</function>,
+    <function>udev_device_new_from_subsystem_sysname</function>,
+    <function>udev_device_new_from_device_id</function>, and
+    <function>udev_device_new_from_environment</function>
+    allocate a new udev device object and returns a pointer to it. This
+    object is opaque and must not be accessed by the caller via different
+    means than functions provided by libudev. Initially, the reference count
+    of the device is 1. You can acquire further references, and drop
+    gained references via <function>udev_device_ref()</function> and
+    <function>udev_device_unref()</function>. Once the reference count hits 0,
+    the device object is destroyed and freed.</para>
+
+    <para><function>udev_device_new_from_syspath</function>,
+    <function>udev_device_new_from_devnum</function>,
+    <function>udev_device_new_from_subsystem_sysname</function>, and
+    <function>udev_device_new_from_device_id</function>
+    create the device object based on information found in
+    <filename>/sys</filename> annotated with properties from the udev-internal
+    device database. A syspath is any subdirectory of <filename>/sys</filename>,
+    with the restriction that a subdirectory of <filename>/sys/devices</filename>
+    (or a symlink to one) represents a real device and as such must contain
+    a <filename>uevent</filename> file. <function>udev_device_new_from_devnum</function>
+    takes a device type, which can be <constant>b</constant> for block devices or
+    <constant>c</constant> for character devices, as well as a devnum (see
+    <citerefentry><refentrytitle>makedev</refentrytitle><manvolnum>3</manvolnum></citerefentry>).
+    <function>udev_device_new_from_subsystem_sysname</function> looks up devices based
+    on the provided subsystem and sysname and
+    <function>udev_device_new_from_device_id</function> looks up devices based on the provided
+    device id (see
+    <citerefentry><refentrytitle>udev_device_get_subsystem</refentrytitle><manvolnum>3</manvolnum></citerefentry>).
+    </para>
+
+    <para><function>udev_device_new_from_environment</function>
+    creates a device from the current environment (see
+    <citerefentry><refentrytitle>environ</refentrytitle><manvolnum>7</manvolnum></citerefentry>).
+    Each key-value pair is interpreted in the same way as if it was
+    received in an uevent (see
+    <citerefentry><refentrytitle>udev_monitor_receive_device</refentrytitle><manvolnum>3</manvolnum></citerefentry>).
+    The keys <constant>DEVPATH</constant>, <constant>SUBSYSTEM</constant>,
+    <constant>ACTION</constant>, and <constant>SEQNUM</constant> are mandatory.</para>
+
+  </refsect1>
 
   <refsect1>
     <title>Return Value</title>

commit 9ee7a50c0bab0d8df324399aa7d43bbdceaf0318
Author: David Herrmann <dh.herrmann at gmail.com>
Date:   Wed Jun 17 19:15:58 2015 +0200

    bus: fix installing DRIVER matches on kdbus
    
    In kdbus we still have to support org.freedesktop.DBus matches even though
    there is no real bus driver. The reason is that bus-control.c turns
    NameOwnerChanged matches into proper kdbus matches. If we drop DRIVER
    matches early, we will never match on name-changes for kdbus.
    
    Two ways to fix this:
    
     1) Install DRIVER matches on kdbus (which is the simple way our and which
        is what this patch does).
    
     2) Properly fix the scope-detection to let NameOwnerChanged matches
        through (or better: block anything with Member!=NameOwnerChanged).

diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
index b559ee9..5dd6468 100644
--- a/src/libsystemd/sd-bus/sd-bus.c
+++ b/src/libsystemd/sd-bus/sd-bus.c
@@ -2945,10 +2945,8 @@ _public_ int sd_bus_add_match(
 
                 /* Do not install server-side matches for matches
                  * against the local service, interface or bus
-                 * path. Also, when on kdbus don't install driver
-                 * matches server side. */
-                if (scope == BUS_MATCH_GENERIC ||
-                    (!bus->is_kernel && scope == BUS_MATCH_DRIVER)) {
+                 * path. */
+                if (scope != BUS_MATCH_LOCAL) {
 
                         if (!bus->is_kernel) {
                                 /* When this is not a kernel transport, we

commit 144c348883a71ecc580ecf11967ceb9f304bd9da
Author: Thomas Hindoe Paaboel Andersen <phomes at gmail.com>
Date:   Wed Jun 17 18:09:31 2015 +0200

    sd-dhcp-client: readd deleted error check
    
    Seems to have been removed by mistake in:
    9021bb9f935c93b516b10c88db2a212a9e3a8140

diff --git a/src/libsystemd-network/sd-dhcp-client.c b/src/libsystemd-network/sd-dhcp-client.c
index 6853038..6a0d270 100644
--- a/src/libsystemd-network/sd-dhcp-client.c
+++ b/src/libsystemd-network/sd-dhcp-client.c
@@ -928,6 +928,8 @@ static int client_initialize_time_events(sd_dhcp_client *client) {
 
         r = sd_event_source_set_priority(client->timeout_resend,
                                          client->event_priority);
+        if (r < 0)
+                goto error;
 
         r = sd_event_source_set_description(client->timeout_resend, "dhcp4-resend-timer");
         if (r < 0)

commit 79b04ad7d40b128ac161d8773efd6860e3730863
Merge: 633f2d5 40e749b
Author: Kay Sievers <kay at vrfy.org>
Date:   Wed Jun 17 19:06:49 2015 +0200

    Merge pull request #262 from teg/udev-dup-fds-2
    
    udevd: daemon - connect /dev/null to std{in,out,err} in debug mode


commit 633f2d59edeb3aa9cf88454780d55fac2e4dbe8d
Merge: 14f494c 1b09f54
Author: Kay Sievers <kay at vrfy.org>
Date:   Wed Jun 17 19:06:13 2015 +0200

    Merge pull request #263 from kaysievers/wip
    
    turn kdbus support into a runtime option


commit 14f494c710bec8fcbadb5f46a9c25b9ebf367f19
Author: Jean Delvare <jdelvare at suse.de>
Date:   Wed Jun 17 18:57:39 2015 +0200

    watchdog: Don't require WDIOC_SETOPTIONS/WDIOS_ENABLECARD
    
    Not all watchdog drivers implement WDIOC_SETOPTIONS. Drivers which do
    not implement it have their device always enabled. So it's fine to
    report an error if WDIOS_DISABLECARD is passed and the ioctl is not
    implemented, however failing when WDIOS_ENABLECARD is passed and the
    ioctl is not implemented is not good: if the device was already
    enabled then WDIOS_ENABLECARD was a no-op and wasn't needed in the
    first place. So we can just ignore the error and continue.

diff --git a/src/shared/watchdog.c b/src/shared/watchdog.c
index 2fe4eb8..9d39beb 100644
--- a/src/shared/watchdog.c
+++ b/src/shared/watchdog.c
@@ -60,8 +60,13 @@ static int update_timeout(void) {
 
                 flags = WDIOS_ENABLECARD;
                 r = ioctl(watchdog_fd, WDIOC_SETOPTIONS, &flags);
-                if (r < 0)
-                        return log_warning_errno(errno, "Failed to enable hardware watchdog: %m");
+                if (r < 0) {
+                        /* ENOTTY means the watchdog is always enabled so we're fine */
+                        log_full(errno == ENOTTY ? LOG_DEBUG : LOG_WARNING,
+                                 "Failed to enable hardware watchdog: %m");
+                        if (errno != ENOTTY)
+                                return -errno;
+                }
 
                 r = ioctl(watchdog_fd, WDIOC_KEEPALIVE, 0);
                 if (r < 0)

commit 99cfda2f7fa540866172358db2ff059b57c3b3ea
Merge: a54941f 9e281be
Author: Tom Gundersen <teg at jklm.no>
Date:   Wed Jun 17 19:02:19 2015 +0200

    Merge pull request #259 from poettering/logind-label-fix
    
    logind: apply selinux label to XDG_RUNTIME_DIR


commit 40e749b59ba49fb97c1f45859debe2a82bc9c9ef
Author: Tom Gundersen <teg at jklm.no>
Date:   Wed Jun 17 17:43:11 2015 +0200

    udevd: daemon - connect /dev/null to std{in,out,err} in debug mode
    
    This is essentially a revert of 5c67cf2 and fixes issue #190.

diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index 5ce1160..11f1f63 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -43,6 +43,7 @@
 #include "sd-daemon.h"
 #include "sd-event.h"
 
+#include "terminal-util.h"
 #include "signal-util.h"
 #include "event-util.h"
 #include "netlink-util.h"
@@ -1687,6 +1688,10 @@ int main(int argc, char *argv[]) {
 
                 log_info("starting version " VERSION);
 
+                /* connect /dev/null to stdin, stdout, stderr */
+                if (log_get_max_level() < LOG_DEBUG)
+                        (void) make_null_stdio();
+
                 pid = fork();
                 switch (pid) {
                 case 0:

commit 71161305f191d1fe1242ccca47657f9ab51caad4
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Jun 17 16:45:49 2015 +0100

    logind: save /run/systemd/users/UID before starting user at .service
    
    Previously, this had a race condition during a user's first login.
    Some component calls CreateSession (most likely by a PAM service
    other than 'systemd-user' running pam_systemd), with the following
    results:
    
    - logind:
      * create the user's XDG_RUNTIME_DIR
      * tell pid 1 to create user-UID.slice
      * tell pid 1 to start user at UID.service
    
    Then these two processes race:
    
    - logind:
      * save information including XDG_RUNTIME_DIR to /run/systemd/users/UID
    
    - the subprocess of pid 1 responsible for user at service:
      * start a 'systemd-user' PAM session, which reads XDG_RUNTIME_DIR
        and puts it in the environment
      * run systemd --user, which requires XDG_RUNTIME_DIR in the
        environment
    
    If logind wins the race, which usually happens, everything is fine;
    but if the subprocesses of pid 1 win the race, which can happen
    under load, then systemd --user exits unsuccessfully.
    
    To avoid this race, we have to write out /run/systemd/users/UID
    even though the service has not "officially" started yet;
    previously this did an early-return without saving anything.
    Record its state as OPENING in this case.
    
    Bug: https://github.com/systemd/systemd/issues/232
    Reviewed-by: Philip Withnall <philip.withnall at collabora.co.uk>

diff --git a/src/login/logind-user.c b/src/login/logind-user.c
index 6720899..bfbdc9b 100644
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -105,7 +105,7 @@ void user_free(User *u) {
         free(u);
 }
 
-int user_save(User *u) {
+static int user_save_internal(User *u) {
         _cleanup_free_ char *temp_path = NULL;
         _cleanup_fclose_ FILE *f = NULL;
         int r;
@@ -113,9 +113,6 @@ int user_save(User *u) {
         assert(u);
         assert(u->state_file);
 
-        if (!u->started)
-                return 0;
-
         r = mkdir_safe_label("/run/systemd/users", 0755, 0, 0);
         if (r < 0)
                 goto finish;
@@ -258,6 +255,15 @@ finish:
         return r;
 }
 
+int user_save(User *u) {
+        assert(u);
+
+        if (!u->started)
+                return 0;
+
+        return user_save_internal (u);
+}
+
 int user_load(User *u) {
         _cleanup_free_ char *display = NULL, *realtime = NULL, *monotonic = NULL;
         Session *s = NULL;
@@ -453,6 +459,12 @@ int user_start(User *u) {
         if (r < 0)
                 return r;
 
+        /* Save the user data so far, because pam_systemd will read the
+         * XDG_RUNTIME_DIR out of it while starting up systemd --user.
+         * We need to do user_save_internal() because we have not
+         * "officially" started yet. */
+        user_save_internal(u);
+
         /* Spawn user systemd */
         r = user_start_service(u);
         if (r < 0)
@@ -704,7 +716,7 @@ UserState user_get_state(User *u) {
         if (u->stopping)
                 return USER_CLOSING;
 
-        if (u->slice_job || u->service_job)
+        if (!u->started || u->slice_job || u->service_job)
                 return USER_OPENING;
 
         if (u->sessions) {

commit 1b09f548c7f303b486b5b1321c06336bff72ada4
Author: Kay Sievers <kay at vrfy.org>
Date:   Wed Jun 17 16:37:55 2015 +0200

    turn kdbus support into a runtime option
    
    ./configure --enable/disable-kdbus can be used to set the default
    behavior regarding kdbus.
    
    If no kdbus kernel support is available, dbus-dameon will be used.
    
    With --enable-kdbus, the kernel command line option "kdbus=0" can
    be used to disable kdbus.
    
    With --disable-kdbus, the kernel command line option "kdbus=1" is
    required to enable kdbus support.

diff --git a/Makefile-man.am b/Makefile-man.am
index 15781ba..9e2f4ba 100644
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -1052,7 +1052,6 @@ MANPAGES_ALIAS += \
 
 endif
 
-if ENABLE_KDBUS
 MANPAGES += \
 	man/sd_bus_creds_get_pid.3 \
 	man/sd_bus_creds_new_from_pid.3 \
@@ -1491,8 +1490,6 @@ man/sd_event_unref.html: man/sd_event_new.html
 man/systemd-bus-proxyd.socket.html: man/systemd-bus-proxyd at .service.html
 	$(html-alias)
 
-endif
-
 if ENABLE_LOCALED
 MANPAGES += \
 	man/localectl.1 \
diff --git a/Makefile.am b/Makefile.am
index 6594cab..7cc7044 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -338,10 +338,8 @@ INSTALL_EXEC_HOOKS += \
 	install-aliases-hook \
 	install-touch-usr-hook
 
-if ENABLE_KDBUS
 INSTALL_EXEC_HOOKS += \
 	install-busnames-target-wants-hook
-endif
 
 # ------------------------------------------------------------------------------
 AM_V_M4 = $(AM_V_M4_$(V))
@@ -522,10 +520,8 @@ dist_systemunit_DATA = \
 	units/initrd-switch-root.target \
 	units/machines.target
 
-if ENABLE_KDBUS
 dist_systemunit_DATA += \
 	$(dist_systemunit_DATA_busnames)
-endif
 
 dist_systemunit_DATA_busnames += \
 	units/busnames.target
@@ -2622,7 +2618,6 @@ systemd_gpt_auto_generator_CFLAGS = \
 endif
 
 # ------------------------------------------------------------------------------
-if ENABLE_KDBUS
 systemgenerator_PROGRAMS +=  \
 	systemd-dbus1-generator
 
@@ -2645,7 +2640,6 @@ dist_xinitrc_SCRIPTS = \
 
 INSTALL_EXEC_HOOKS += dbus1-generator-install-hook
 UNINSTALL_EXEC_HOOKS += dbus1-generator-uninstall-hook
-endif
 
 # ------------------------------------------------------------------------------
 systemd_sysv_generator_SOURCES = \
@@ -2793,7 +2787,6 @@ systemd_stdio_bridge_LDADD = \
 	libbus-proxy-core.la \
 	libshared.la
 
-if ENABLE_KDBUS
 nodist_systemunit_DATA += \
 	units/systemd-bus-proxyd.service
 
@@ -2805,7 +2798,6 @@ nodist_userunit_DATA += \
 
 dist_userunit_DATA += \
 	units/user/systemd-bus-proxyd.socket
-endif
 
 EXTRA_DIST += \
 	units/systemd-bus-proxyd.service.m4.in \
@@ -2971,14 +2963,6 @@ pkginclude_HEADERS += \
 	src/systemd/sd-id128.h \
 	src/systemd/sd-daemon.h
 
-if ENABLE_KDBUS
-pkginclude_HEADERS += \
-	src/systemd/sd-utf8.h \
-	src/systemd/sd-netlink.h \
-	src/systemd/sd-resolve.h \
-	src/systemd/sd-path.h
-endif
-
 lib_LTLIBRARIES += \
 	libsystemd.la
 
@@ -6174,10 +6158,8 @@ USER_UNIT_ALIASES += \
 	$(systemunitdir)/sound.target sound.target \
 	$(systemunitdir)/smartcard.target smartcard.target
 
-if ENABLE_KDBUS
 USER_UNIT_ALIASES += \
 	$(systemunitdir)/busnames.target busnames.target
-endif
 
 GENERAL_ALIASES += \
 	$(systemunitdir)/remote-fs.target $(pkgsysconfdir)/system/multi-user.target.wants/remote-fs.target \
@@ -6238,7 +6220,6 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--with-pamlibdir=$$dc_install_base/$(pamlibdir) \
 	--with-pamconfdir=$$dc_install_base/$(pamconfdir) \
 	--with-rootprefix=$$dc_install_base \
-	--enable-kdbus \
 	--enable-compat-libs
 
 if HAVE_SYSV_COMPAT
@@ -6299,11 +6280,6 @@ hwdb-update:
 		http://standards.ieee.org/develop/regauth/iab/iab.txt && \
 	./ids-update.pl )
 
-.PHONY: kdbus-update
-kdbus-update:
-	( cd $(top_srcdir)/src/libsystemd/sd-bus/ && \
-	wget -N https://d-bus.googlecode.com/git/kdbus.h )
-
 .PHONY: git-tag
 git-tag:
 	git tag -s "v$(VERSION)" -m "systemd $(VERSION)"
diff --git a/configure.ac b/configure.ac
index b94dbd1..e5d3994 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1203,9 +1203,9 @@ AM_CONDITIONAL(ENABLE_TERMINAL, [test "x$have_terminal" = "xyes" -a "x$have_unif
 
 # ------------------------------------------------------------------------------
 have_kdbus=no
-AC_ARG_ENABLE(kdbus, AS_HELP_STRING([--enable-kdbus], [do connect to kdbus by default]))
-if test "x$enable_kdbus" = "xyes"; then
-        AC_DEFINE(ENABLE_KDBUS, 1, [Define if kdbus support is to be enabled])
+AC_ARG_ENABLE(kdbus, AS_HELP_STRING([--disable-kdbus], [do not connect to kdbus by default]))
+if test "x$enable_kdbus" != "xno"; then
+        AC_DEFINE(ENABLE_KDBUS, 1, [Define if kdbus is to be connected to by default])
         have_kdbus=yes
         M4_DEFINES="$M4_DEFINES -DENABLE_KDBUS"
 fi
diff --git a/man/systemd-bus-proxyd.xml b/man/systemd-bus-proxyd.xml
index bbcf3d0..f7b94cd 100644
--- a/man/systemd-bus-proxyd.xml
+++ b/man/systemd-bus-proxyd.xml
@@ -24,7 +24,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="systemd-bus-proxyd" conditional="ENABLE_KDBUS"
+<refentry id="systemd-bus-proxyd"
           xmlns:xi="http://www.w3.org/2001/XInclude">
 
   <refentryinfo>
diff --git a/man/systemd-bus-proxyd at .service.xml b/man/systemd-bus-proxyd at .service.xml
index 9dabc4d..4ac6ba0 100644
--- a/man/systemd-bus-proxyd at .service.xml
+++ b/man/systemd-bus-proxyd at .service.xml
@@ -24,7 +24,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="systemd-bus-proxyd at .service" conditional='ENABLE_KDBUS'>
+<refentry id="systemd-bus-proxyd at .service">
 
   <refentryinfo>
     <title>systemd-bus-proxyd at .service</title>
diff --git a/src/basic/def.h b/src/basic/def.h
index 011c7c6..5aaba1f 100644
--- a/src/basic/def.h
+++ b/src/basic/def.h
@@ -63,13 +63,7 @@
 
 #define UNIX_SYSTEM_BUS_ADDRESS "unix:path=/var/run/dbus/system_bus_socket"
 #define KERNEL_SYSTEM_BUS_ADDRESS "kernel:path=/sys/fs/kdbus/0-system/bus"
-
-#ifdef ENABLE_KDBUS
-#  define DEFAULT_SYSTEM_BUS_ADDRESS KERNEL_SYSTEM_BUS_ADDRESS ";" UNIX_SYSTEM_BUS_ADDRESS
-#else
-#  define DEFAULT_SYSTEM_BUS_ADDRESS UNIX_SYSTEM_BUS_ADDRESS
-#endif
-
+#define DEFAULT_SYSTEM_BUS_ADDRESS KERNEL_SYSTEM_BUS_ADDRESS ";" UNIX_SYSTEM_BUS_ADDRESS
 #define UNIX_USER_BUS_ADDRESS_FMT "unix:path=%s/bus"
 #define KERNEL_USER_BUS_ADDRESS_FMT "kernel:path=/sys/fs/kdbus/"UID_FMT"-user/bus"
 
diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c
index 3e398b5..3cc3b33 100644
--- a/src/bus-proxyd/bus-proxyd.c
+++ b/src/bus-proxyd/bus-proxyd.c
@@ -239,11 +239,7 @@ static int parse_argv(int argc, char *argv[]) {
                         if (!e)
                                 return log_oom();
 
-#ifdef ENABLE_KDBUS
                         a = strjoin("x-machine-kernel:machine=", e, ";x-machine-unix:machine=", e, NULL);
-#else
-                        a = strjoin("x-machine-unix:machine=", e, NULL);
-#endif
                         if (!a)
                                 return log_oom();
 
diff --git a/src/bus-proxyd/stdio-bridge.c b/src/bus-proxyd/stdio-bridge.c
index 61bc08a..f275f67 100644
--- a/src/bus-proxyd/stdio-bridge.c
+++ b/src/bus-proxyd/stdio-bridge.c
@@ -110,11 +110,7 @@ static int parse_argv(int argc, char *argv[]) {
                         if (!e)
                                 return log_oom();
 
-#ifdef ENABLE_KDBUS
                         a = strjoin("x-machine-kernel:machine=", e, ";x-machine-unix:machine=", e, NULL);
-#else
-                        a = strjoin("x-machine-unix:machine=", e, NULL);
-#endif
                         if (!a)
                                 return log_oom();
 
diff --git a/src/core/execute.c b/src/core/execute.c
index a6ff5ac..94cc101 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -1514,7 +1514,6 @@ static int exec_child(
                 }
         }
 
-#ifdef ENABLE_KDBUS
         if (params->bus_endpoint_fd >= 0 && context->bus_endpoint) {
                 uid_t ep_uid = (uid == UID_INVALID) ? 0 : uid;
 
@@ -1524,7 +1523,6 @@ static int exec_child(
                         return r;
                 }
         }
-#endif
 
         /* If delegation is enabled we'll pass ownership of the cgroup
          * (but only in systemd's own controller hierarchy!) to the
diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c
index f5584b6..e7a6bdc 100644
--- a/src/core/kmod-setup.c
+++ b/src/core/kmod-setup.c
@@ -66,10 +66,8 @@ int kmod_setup(void) {
                 /* this should never be a module */
                 { "unix",      "/proc/net/unix",            true,   true,    NULL      },
 
-#ifdef ENABLE_KDBUS
                 /* IPC is needed before we bring up any other services */
                 { "kdbus",     "/sys/fs/kdbus",             false,  false,   is_kdbus_wanted },
-#endif
 
 #ifdef HAVE_LIBIPTC
                 /* netfilter is needed by networkd, nspawn among others, and cannot be autoloaded */
diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4
index 66c9145..aae81c8 100644
--- a/src/core/load-fragment-gperf.gperf.m4
+++ b/src/core/load-fragment-gperf.gperf.m4
@@ -229,9 +229,7 @@ Service.BusName,                 config_parse_bus_name,              0,
 Service.FileDescriptorStoreMax,  config_parse_unsigned,              0,                             offsetof(Service, n_fd_store_max)
 Service.NotifyAccess,            config_parse_notify_access,         0,                             offsetof(Service, notify_access)
 Service.Sockets,                 config_parse_service_sockets,       0,                             0
-m4_ifdef(`ENABLE_KDBUS',
-`Service.BusPolicy,              config_parse_bus_endpoint_policy,   0,                             offsetof(Service, exec_context)',
-`Service.BusPolicy,              config_parse_warn_compat,           DISABLED_EXPERIMENTAL,         0')
+Service.BusPolicy,               config_parse_bus_endpoint_policy,   0,                             offsetof(Service, exec_context)
 EXEC_CONTEXT_CONFIG_ITEMS(Service)m4_dnl
 CGROUP_CONTEXT_CONFIG_ITEMS(Service)m4_dnl
 KILL_CONTEXT_CONFIG_ITEMS(Service)m4_dnl
diff --git a/src/core/manager.c b/src/core/manager.c
index eb80dd1..a1f37bb 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -731,7 +731,6 @@ static int manager_setup_notify(Manager *m) {
 }
 
 static int manager_setup_kdbus(Manager *m) {
-#ifdef ENABLE_KDBUS
         _cleanup_free_ char *p = NULL;
 
         assert(m);
@@ -749,7 +748,6 @@ static int manager_setup_kdbus(Manager *m) {
                 return log_debug_errno(m->kdbus_fd, "Failed to set up kdbus: %m");
 
         log_debug("Successfully set up kdbus on %s", p);
-#endif
 
         return 0;
 }
diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
index c35248e..42a6b95 100644
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -104,10 +104,8 @@ static const MountPoint mount_table[] = {
         { "efivarfs",    "/sys/firmware/efi/efivars", "efivarfs",   NULL,                      MS_NOSUID|MS_NOEXEC|MS_NODEV,
           is_efi_boot,   MNT_NONE                   },
 #endif
-#ifdef ENABLE_KDBUS
         { "kdbusfs",    "/sys/fs/kdbus",             "kdbusfs",    NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV,
           NULL,       MNT_IN_CONTAINER },
-#endif
 };
 
 /* These are API file systems that might be mounted by other software,
diff --git a/src/core/service.c b/src/core/service.c
index 71252e2..fa1e80b 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -568,14 +568,12 @@ static int service_add_extras(Service *s) {
                 s->notify_access = NOTIFY_MAIN;
 
         if (s->bus_name) {
-#ifdef ENABLE_KDBUS
                 const char *n;
 
                 n = strjoina(s->bus_name, ".busname");
                 r = unit_add_dependency_by_name(UNIT(s), UNIT_AFTER, n, NULL, true);
                 if (r < 0)
                         return r;
-#endif
 
                 r = unit_watch_bus_name(UNIT(s), s->bus_name);
                 if (r < 0)
@@ -1180,7 +1178,6 @@ static int service_spawn(
         } else
                 path = UNIT(s)->cgroup_path;
 
-#ifdef ENABLE_KDBUS
         if (s->exec_context.bus_endpoint) {
                 r = bus_kernel_create_endpoint(UNIT(s)->manager->running_as == MANAGER_SYSTEM ? "system" : "user",
                                                UNIT(s)->id, &bus_endpoint_path);
@@ -1192,7 +1189,6 @@ static int service_spawn(
                  * as the service is running. */
                 exec_params.bus_endpoint_fd = s->bus_endpoint_fd = r;
         }
-#endif
 
         exec_params.argv = argv;
         exec_params.fds = fds;
diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
index 0881b47..b559ee9 100644
--- a/src/libsystemd/sd-bus/sd-bus.c
+++ b/src/libsystemd/sd-bus/sd-bus.c
@@ -1239,18 +1239,9 @@ int bus_set_address_user(sd_bus *b) {
                 if (!ee)
                         return -ENOMEM;
 
-#ifdef ENABLE_KDBUS
                 (void) asprintf(&b->address, KERNEL_USER_BUS_ADDRESS_FMT ";" UNIX_USER_BUS_ADDRESS_FMT, getuid(), ee);
-#else
-                (void) asprintf(&b->address, UNIX_USER_BUS_ADDRESS_FMT, ee);
-#endif
-        } else {
-#ifdef ENABLE_KDBUS
+        } else
                 (void) asprintf(&b->address, KERNEL_USER_BUS_ADDRESS_FMT, getuid());
-#else
-                return -ECONNREFUSED;
-#endif
-        }
 
         if (!b->address)
                 return -ENOMEM;
@@ -1372,11 +1363,7 @@ int bus_set_address_system_machine(sd_bus *b, const char *machine) {
         if (!e)
                 return -ENOMEM;
 
-#ifdef ENABLE_KDBUS
         b->address = strjoin("x-machine-kernel:machine=", e, ";x-machine-unix:machine=", e, NULL);
-#else
-        b->address = strjoin("x-machine-unix:machine=", e, NULL);
-#endif
         if (!b->address)
                 return -ENOMEM;
 
diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c
index b5d4190..0ebdfdf 100644
--- a/src/login/pam_systemd.c
+++ b/src/login/pam_systemd.c
@@ -177,7 +177,6 @@ static int export_legacy_dbus_address(
                 uid_t uid,
                 const char *runtime) {
 
-#ifdef ENABLE_KDBUS
         _cleanup_free_ char *s = NULL;
         int r;
 
@@ -195,7 +194,7 @@ static int export_legacy_dbus_address(
                 pam_syslog(handle, LOG_ERR, "Failed to set bus variable.");
                 return r;
         }
-#endif
+
         return PAM_SUCCESS;
 }
 
diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
index 9f026be..7813a0b 100644
--- a/src/machine/machine-dbus.c
+++ b/src/machine/machine-dbus.c
@@ -509,11 +509,7 @@ int bus_machine_method_open_login(sd_bus_message *message, void *userdata, sd_bu
         if (r < 0)
                 return r;
 
-#ifdef ENABLE_KDBUS
 #  define ADDRESS_FMT "x-machine-kernel:pid=%1$" PID_PRI ";x-machine-unix:pid=%1$" PID_PRI
-#else
-#  define ADDRESS_FMT "x-machine-unix:pid=%1$" PID_PRI
-#endif
         if (asprintf(&address, ADDRESS_FMT, m->leader) < 0)
                 return log_oom();
 
diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
index 8fcc289..11350da 100644
--- a/src/shared/bus-util.c
+++ b/src/shared/bus-util.c
@@ -545,7 +545,6 @@ int bus_open_system_systemd(sd_bus **_bus) {
          * directly to the system instance, instead of going via the
          * bus */
 
-#ifdef ENABLE_KDBUS
         r = sd_bus_new(&bus);
         if (r < 0)
                 return r;
@@ -564,7 +563,6 @@ int bus_open_system_systemd(sd_bus **_bus) {
         }
 
         bus = sd_bus_unref(bus);
-#endif
 
         r = sd_bus_new(&bus);
         if (r < 0)
@@ -598,7 +596,6 @@ int bus_open_user_systemd(sd_bus **_bus) {
 
         assert(_bus);
 
-#ifdef ENABLE_KDBUS
         r = sd_bus_new(&bus);
         if (r < 0)
                 return r;
@@ -616,7 +613,6 @@ int bus_open_user_systemd(sd_bus **_bus) {
         }
 
         bus = sd_bus_unref(bus);
-#endif
 
         e = secure_getenv("XDG_RUNTIME_DIR");
         if (!e)
@@ -2034,15 +2030,22 @@ int bus_path_decode_unique(const char *path, const char *prefix, char **ret_send
 
 bool is_kdbus_wanted(void) {
         _cleanup_free_ char *value = NULL;
+#ifdef ENABLE_KDBUS
+        const bool configured = true;
+#else
+        const bool configured = false;
+#endif
+
         int r;
 
-        if (get_proc_cmdline_key("kdbus", NULL) <= 0) {
-                r = get_proc_cmdline_key("kdbus=", &value);
-                if (r <= 0 || parse_boolean(value) != 1)
-                        return false;
-        }
+        if (get_proc_cmdline_key("kdbus", NULL) > 0)
+                return true;
+
+        r = get_proc_cmdline_key("kdbus=", &value);
+        if (r <= 0)
+                return configured;
 
-        return true;
+        return parse_boolean(value) == 1;
 }
 
 bool is_kdbus_available(void) {
diff --git a/sysusers.d/systemd.conf.m4 b/sysusers.d/systemd.conf.m4
index 23175de..81b1d79 100644
--- a/sysusers.d/systemd.conf.m4
+++ b/sysusers.d/systemd.conf.m4
@@ -6,9 +6,7 @@
 #  (at your option) any later version.
 
 g systemd-journal   - -
-m4_ifdef(`ENABLE_KDBUS',
 u systemd-bus-proxy - "systemd Bus Proxy"
-)m4_dnl
 m4_ifdef(`ENABLE_NETWORKD',
 u systemd-network   - "systemd Network Management"
 )m4_dnl
diff --git a/units/systemd-networkd.service.m4.in b/units/systemd-networkd.service.m4.in
index 7f216f3..64d9130 100644
--- a/units/systemd-networkd.service.m4.in
+++ b/units/systemd-networkd.service.m4.in
@@ -17,13 +17,11 @@ Before=network.target multi-user.target shutdown.target
 Conflicts=shutdown.target
 Wants=network.target
 
-m4_ifdef(`ENABLE_KDBUS',
 # On kdbus systems we pull in the busname explicitly, because it
 # carries policy that allows the daemon to acquire its name.
 Wants=org.freedesktop.network1.busname
 After=org.freedesktop.network1.busname
 
-)m4_dnl
 [Service]
 Type=notify
 Restart=on-failure
diff --git a/units/systemd-resolved.service.m4.in b/units/systemd-resolved.service.m4.in
index 98ae564..dce5402 100644
--- a/units/systemd-resolved.service.m4.in
+++ b/units/systemd-resolved.service.m4.in
@@ -10,13 +10,11 @@ Description=Network Name Resolution
 Documentation=man:systemd-resolved.service(8)
 After=systemd-networkd.service network.target
 
-m4_ifdef(`ENABLE_KDBUS',
 # On kdbus systems we pull in the busname explicitly, because it
 # carries policy that allows the daemon to acquire its name.
 Wants=org.freedesktop.resolve1.busname
 After=org.freedesktop.resolve1.busname
 
-)m4_dnl
 [Service]
 Type=notify
 Restart=always

commit 8f8a5213a9ad89f1ebab6efb19377ed9df512ee6
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Tue Jun 16 15:46:40 2015 +0200

    hashmap: allow NULL key in ordered_hashmap_next()
    
    There is no reason to require key to be non-NULL.
    Change test_ordered_hashmap_next() to use trivial_hash_ops in order to
    test NULL key too.

diff --git a/src/basic/hashmap.c b/src/basic/hashmap.c
index 0ee2f3b..e5f05f3 100644
--- a/src/basic/hashmap.c
+++ b/src/basic/hashmap.c
@@ -1798,8 +1798,6 @@ void *ordered_hashmap_next(OrderedHashmap *h, const void *key) {
         struct ordered_hashmap_entry *e;
         unsigned hash, idx;
 
-        assert(key);
-
         if (!h)
                 return NULL;
 
diff --git a/src/test/test-hashmap.c b/src/test/test-hashmap.c
index 767cbd9..d0e6500 100644
--- a/src/test/test-hashmap.c
+++ b/src/test/test-hashmap.c
@@ -24,38 +24,17 @@ void test_hashmap_funcs(void);
 void test_ordered_hashmap_funcs(void);
 
 static void test_ordered_hashmap_next(void) {
-        OrderedHashmap *m;
-        char *val1, *val2, *val3, *val4, *r;
-
-        m = ordered_hashmap_new(&string_hash_ops);
-        val1 = strdup("val1");
-        assert_se(val1);
-        val2 = strdup("val2");
-        assert_se(val2);
-        val3 = strdup("val3");
-        assert_se(val3);
-        val4 = strdup("val4");
-        assert_se(val4);
-
-        ordered_hashmap_put(m, "key 1", val1);
-        ordered_hashmap_put(m, "key 2", val2);
-        ordered_hashmap_put(m, "key 3", val3);
-        ordered_hashmap_put(m, "key 4", val4);
-
-        r = ordered_hashmap_next(m, "key 1");
-        assert_se(streq(r, val2));
-        r = ordered_hashmap_next(m, "key 2");
-        assert_se(streq(r, val3));
-        r = ordered_hashmap_next(m, "key 3");
-        assert_se(streq(r, val4));
-        r = ordered_hashmap_next(m, "key 4");
-        assert_se(!r);
-        r = ordered_hashmap_next(NULL, "key 1");
-        assert_se(!r);
-        r = ordered_hashmap_next(m, "key 5");
-        assert_se(!r);
-
-        ordered_hashmap_free_free(m);
+        _cleanup_ordered_hashmap_free_ OrderedHashmap *m = NULL;
+        int i;
+
+        assert_se(m = ordered_hashmap_new(NULL));
+        for (i = -2; i <= 2; i++)
+                assert_se(ordered_hashmap_put(m, INT_TO_PTR(i), INT_TO_PTR(i+10)) == 1);
+        for (i = -2; i <= 1; i++)
+                assert_se(ordered_hashmap_next(m, INT_TO_PTR(i)) == INT_TO_PTR(i+11));
+        assert_se(!ordered_hashmap_next(m, INT_TO_PTR(2)));
+        assert_se(!ordered_hashmap_next(NULL, INT_TO_PTR(1)));
+        assert_se(!ordered_hashmap_next(m, INT_TO_PTR(3)));
 }
 
 static void test_uint64_compare_func(void) {

commit 49e440cdc9782ea615e4b6a4dd21e12716a5b675
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Tue Jun 16 15:43:06 2015 +0200

    hashmap: remove _IDX_ITERATOR_NIL definition
    
    It is unused and rightly so. Users of the hashmap API should
    not care about the idx values or any other Iterator internals.
    _IDX_ITERATOR_FIRST in hashmap.h is an exception. It is needed
    for ITERATOR_FIRST.

diff --git a/src/basic/hashmap.h b/src/basic/hashmap.h
index 5723f09..2af2302 100644
--- a/src/basic/hashmap.h
+++ b/src/basic/hashmap.h
@@ -65,7 +65,6 @@ typedef struct {
 } Iterator;
 
 #define _IDX_ITERATOR_FIRST (UINT_MAX - 1)
-#define _IDX_ITERATOR_NIL (UINT_MAX)
 #define ITERATOR_FIRST ((Iterator) { .idx = _IDX_ITERATOR_FIRST, .next_key = NULL })
 
 typedef unsigned long (*hash_func_t)(const void *p, const uint8_t hash_key[HASH_KEY_SIZE]);

commit 9e281beb8ebff96366eff63bd54087681706c803
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jun 17 16:29:03 2015 +0200

    logind: apply selinux label to XDG_RUNTIME_DIR
    
    As discussed in #257: we should ensure the selinux label is correctly
    applied to each user's XDG_RUNTIME_DIR.

diff --git a/src/login/logind-user.c b/src/login/logind-user.c
index 6720899..738e69c 100644
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -36,9 +36,10 @@
 #include "bus-error.h"
 #include "conf-parser.h"
 #include "clean-ipc.h"
-#include "logind-user.h"
 #include "smack-util.h"
 #include "formats-util.h"
+#include "label.h"
+#include "logind-user.h"
 
 User* user_new(Manager *m, uid_t uid, gid_t gid, const char *name) {
         User *u;
@@ -323,7 +324,7 @@ static int user_mkdir_runtime_path(User *u) {
         if (path_is_mount_point(p, 0) <= 0) {
                 _cleanup_free_ char *t = NULL;
 
-                (void) mkdir(p, 0700);
+                (void) mkdir_label(p, 0700);
 
                 if (mac_smack_use())
                         r = asprintf(&t, "mode=0700,smackfsroot=*,uid=" UID_FMT ",gid=" GID_FMT ",size=%zu", u->uid, u->gid, u->manager->runtime_dir_size);
@@ -351,6 +352,10 @@ static int user_mkdir_runtime_path(User *u) {
                                 goto fail;
                         }
                 }
+
+                r = label_fix(p, false, false);
+                if (r < 0)
+                        log_warning_errno(r, "Failed to fix label of '%s', ignoring: %m", p);
         }
 
         u->runtime_path = p;

commit b0fe29ff9e04d02d939ffca0b942cfb2a3494171
Author: Eric Cook <llua at gmx.com>
Date:   Wed Jun 17 07:41:24 2015 -0400

    zsh-completion: _loginctl - general bug fixes
    
    1) the iterator `fun' has an local scope. after running the completer,
    it will no longer be defined.
    
    2) use _describe instead of calling compadd. Using compadd without
    calling _description or something similar before, restricts the
    user's ability to customize what is presented to them.
    zstyle ':completion:*' format 'Completing %d'
      - now displays an header showing what is being completed.
    zstyle ':completion::complete:loginctl-*::users' users user1 user2
      - allows the user to manually specify which users is offered
    zstyle :completion::complete:loginctl-kill-user:\* \
    ignored-patterns '(100<0-4>|user1)'
      - selectively ignore some users when completing loginctl kill-user
        <tab>
    Sessions, UIDs now have descriptions when selecting them.
    
    3) removed the call to _loginctl_all_seats in _loginctl_attach(), since
    _loginctl_seats calls it a second time, right before adding matches.
    There isn't a noticeable difference doing this.

diff --git a/shell-completion/zsh/_loginctl b/shell-completion/zsh/_loginctl
index bd33b66..1e2a4db 100644
--- a/shell-completion/zsh/_loginctl
+++ b/shell-completion/zsh/_loginctl
@@ -1,15 +1,43 @@
 #compdef loginctl
 
-_loginctl_all_sessions(){_sys_all_sessions=($(loginctl --no-legend list-sessions | { while read a b; do echo " $a"; done; }) )}
-_loginctl_all_users()   {_sys_all_users=(   $(loginctl --no-legend list-users    | { while read a b; do echo " $a"; done; }) )}
-_loginctl_all_seats()   {_sys_all_seats=(   $(loginctl --no-legend list-seats    | { while read a b; do echo " $a"; done; }) )}
+_loginctl_all_sessions() {
+  local session description
+  loginctl --no-legend list-sessions | while read -r session description; do
+    _sys_all_sessions+=( "$session" )
+    _sys_all_sessions_descr+=( "${session}:$description" )
+  done
+}
+
+_loginctl_all_users() {
+  local uid description
+  loginctl --no-legend list-users | while read -r uid description; do
+    _sys_all_users+=( "$uid" )
+    _sys_all_users_descr+=( "${uid}:$description" )
+  done
+}
 
+_loginctl_all_seats() {
+  local seat description
+  loginctl --no-legend list-seats | while read -r seat description; do
+    _sys_all_seats+=( "$seat" )
+    _sys_all_seats_descr+=( "${seat}:$description" )
+  done
+}
+
+local fun
 # Completion functions for SESSIONS
 for fun in session-status show-session activate lock-session unlock-session terminate-session kill-session ; do
   (( $+functions[_loginctl_$fun] )) || _loginctl_$fun()
   {
+    local -a _sys_all_sessions{,_descr}
+
     _loginctl_all_sessions
-    compadd "$@" -a - _sys_all_sessions
+    for _ignore in $words[2,-1]; do
+      _sys_all_sessions[(i)$_ignore]=()
+      _sys_all_sessions_descr[(i)$_ignore:*]=()
+    done
+
+    _describe -t systemd-sessions session _sys_all_sessions_descr _sys_all_sessions "$@"
   }
 done
 
@@ -17,16 +45,34 @@ done
 for fun in user-status show-user enable-linger disable-linger terminate-user kill-user ; do
   (( $+functions[_loginctl_$fun] )) || _loginctl_$fun()
   {
-    _loginctl_all_users
-    compadd "$@" -a - _sys_all_users
+    local -a _sys_all_users{,_descr}
+    zstyle -a ":completion:${curcontext}:users" users _sys_all_users
+
+    if ! (( $#_sys_all_users )); then
+      _loginctl_all_users
+    fi
+
+    for _ignore in $words[2,-1]; do
+      _sys_all_users[(i)$_ignore]=()
+      _sys_all_users_descr[(i)$_ignore:*]=()
+    done
+    # using the common tag `users' here, not rolling our own `systemd-users' tag
+    _describe -t users user ${_sys_all_users_descr:+_sys_all_users_descr} _sys_all_users "$@"
   }
 done
 
 # Completion functions for SEATS
 (( $+functions[_loginctl_seats] )) || _loginctl_seats()
 {
+  local -a _sys_all_seats{,_descr}
+
   _loginctl_all_seats
-  compadd "$@" -a - _sys_all_seats
+  for _ignore in $words[2,-1]; do
+    _sys_all_seats[(i)$_ignore]=()
+    _sys_all_seats_descr[(i)$_ignore:*]=()
+  done
+
+  _describe -t systemd-seats seat _sys_all_seats_descr _sys_all_seats "$@"
 }
 for fun in seat-status show-seat terminate-seat ; do
   (( $+functions[_loginctl_$fun] )) || _loginctl_$fun()
@@ -36,8 +82,6 @@ done
 # Completion functions for ATTACH
 (( $+functions[_loginctl_attach] )) || _loginctl_attach()
 {
-  _loginctl_all_seats
-
   _arguments -w -C -S -s \
     ':seat:_loginctl_seats' \
     '*:device:_files'
@@ -78,7 +122,7 @@ done
   if (( CURRENT == 1 )); then
     _describe -t commands 'loginctl command' _loginctl_cmds || compadd "$@"
   else
-    local curcontext="$curcontext"
+    local curcontext="$curcontext" _ignore
 
     cmd="${${_loginctl_cmds[(r)$words[1]:*]%%:*}}"
 

