3 files changed, 4 insertions, 3 deletions
diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in
index a7cda979d4..02dfe774df 100644
--- a/units/systemd-binfmt.service.in
+++ b/units/systemd-binfmt.service.in
@@ -7,13 +7,14 @@
 
 [Unit]
 Description=Set Up Additional Binary Formats
-Documentation=man:binfmt.d(5)
+Documentation=man:systemd-binfmt.service(8) man:binfmt.d(5)
 Documentation=https://www.kernel.org/doc/Documentation/binfmt_misc.txt
 DefaultDependencies=no
 Conflicts=shutdown.target
 After=systemd-readahead-collect.service systemd-readahead-replay.service proc-sys-fs-binfmt_misc.automount
 Before=sysinit.target shutdown.target
 ConditionPathIsReadWrite=/proc/sys/
+ConditionDirectoryNotEmpty=|/lib/binfmt.d
 ConditionDirectoryNotEmpty=|/usr/lib/binfmt.d
 ConditionDirectoryNotEmpty=|/usr/local/lib/binfmt.d
 ConditionDirectoryNotEmpty=|/etc/binfmt.d
diff --git a/units/systemd-modules-load.service.in b/units/systemd-modules-load.service.in
index 8f25091986..ff6613f81a 100644
--- a/units/systemd-modules-load.service.in
+++ b/units/systemd-modules-load.service.in
@@ -7,7 +7,7 @@
 
 [Unit]
 Description=Load Kernel Modules
-Documentation=man:modules-load.d(5)
+Documentation=man:systemd-modules-load.service(8) man:modules-load.d(5)
 DefaultDependencies=no
 Conflicts=shutdown.target
 After=systemd-readahead-collect.service systemd-readahead-replay.service
diff --git a/units/systemd-sysctl.service.in b/units/systemd-sysctl.service.in
index d8849e7929..45e1ceb25c 100644
--- a/units/systemd-sysctl.service.in
+++ b/units/systemd-sysctl.service.in
@@ -7,7 +7,7 @@
 
 [Unit]
 Description=Apply Kernel Variables
-Documentation=man:sysctl.d(5)
+Documentation=man:systemd-sysctl.service(8) man:sysctl.d(5)
 DefaultDependencies=no
 Conflicts=shutdown.target
 After=systemd-readahead-collect.service systemd-readahead-replay.service