diff --git a/NEWS b/NEWS
index 242f55af29..3bebe5a036 100644
--- a/NEWS
+++ b/NEWS
@@ -348,13 +348,13 @@ CHANGES WITH 239:
         * New documentation has been added to document cgroups delegation,
           portable services and the various code quality tools we have set up:
 
-          https://github.com/systemd/systemd/blob/master/doc/CGROUP_DELEGATION.md
-          https://github.com/systemd/systemd/blob/master/doc/PORTABLE_SERVICES.md
-          https://github.com/systemd/systemd/blob/master/doc/CODE_QUALITY.md
+          https://github.com/systemd/systemd/blob/master/docs/CGROUP_DELEGATION.md
+          https://github.com/systemd/systemd/blob/master/docs/PORTABLE_SERVICES.md
+          https://github.com/systemd/systemd/blob/master/docs/CODE_QUALITY.md
 
         * The Boot Loader Specification has been added to the source tree.
 
-          https://github.com/systemd/systemd/blob/master/doc/BOOT_LOADER_SPECIFICATION.md
+          https://github.com/systemd/systemd/blob/master/docs/BOOT_LOADER_SPECIFICATION.md
 
           While moving it into our source tree we have updated it and further
           changes are now accepted through the usual github PR workflow.
@@ -1670,7 +1670,7 @@ CHANGES WITH 233:
         * Documentation has been added that lists all of systemd's low-level
           environment variables:
 
-          https://github.com/systemd/systemd/blob/master/doc/ENVIRONMENT.md
+          https://github.com/systemd/systemd/blob/master/docs/ENVIRONMENT.md
 
         * sd-daemon gained a new API sd_is_socket_sockaddr() for determining
           whether a specific socket file descriptor matches a specified socket
diff --git a/README.md b/README.md
index 1036140367..bebe259a81 100644
--- a/README.md
+++ b/README.md
@@ -16,11 +16,11 @@ Information about build requirements are provided in the [README file](../master
 
 Consult our [NEWS file](../master/NEWS) for information about what's new in the most recent systemd versions.
 
-Please see the [HACKING file](../master/doc/HACKING) for information how to hack on systemd and test your modifications.
+Please see the [HACKING file](../master/docs/HACKING) for information how to hack on systemd and test your modifications.
 
 Please see our [Contribution Guidelines](../master/.github/CONTRIBUTING.md) for more information about filing GitHub Issues and posting GitHub Pull Requests.
 
-When preparing patches for systemd, please follow our [Coding Style Guidelines](../master/doc/CODING_STYLE).
+When preparing patches for systemd, please follow our [Coding Style Guidelines](../master/docs/CODING_STYLE).
 
 If you are looking for support, please contact our [mailing list](https://lists.freedesktop.org/mailman/listinfo/systemd-devel) or join our [IRC channel](irc://irc.freenode.org/%23systemd).
 
diff --git a/man/bootctl.xml b/man/bootctl.xml
index 9521dc9d98..defe095dde 100644
--- a/man/bootctl.xml
+++ b/man/bootctl.xml
@@ -126,7 +126,7 @@
     <title>See Also</title>
     <para>
       <citerefentry><refentrytitle>systemd-boot</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
-      <ulink url="https://github.com/systemd/systemd/blob/master/doc/BOOT_LOADER_SPECIFICATION.md">Boot Loader Specification</ulink>,
+      <ulink url="https://github.com/systemd/systemd/blob/master/docs/BOOT_LOADER_SPECIFICATION.md">Boot Loader Specification</ulink>,
       <ulink url="https://www.freedesktop.org/wiki/Software/systemd/BootLoaderInterface">Boot Loader Interface</ulink>
     </para>
   </refsect1>
diff --git a/man/kernel-install.xml b/man/kernel-install.xml
index 7dd2de6288..522d5fb54d 100644
--- a/man/kernel-install.xml
+++ b/man/kernel-install.xml
@@ -165,7 +165,7 @@
     <para>
       <citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>os-release</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-      <ulink url="https://github.com/systemd/systemd/blob/master/doc/BOOT_LOADER_SPECIFICATION.md">Boot Loader Specification</ulink>
+      <ulink url="https://github.com/systemd/systemd/blob/master/docs/BOOT_LOADER_SPECIFICATION.md">Boot Loader Specification</ulink>
     </para>
   </refsect1>
 
diff --git a/man/systemd-boot.xml b/man/systemd-boot.xml
index 9fadffadfe..6abed7693a 100644
--- a/man/systemd-boot.xml
+++ b/man/systemd-boot.xml
@@ -38,13 +38,13 @@
 
     <itemizedlist>
       <listitem><para>Boot entries defined with <ulink
-      url="https://github.com/systemd/systemd/blob/master/doc/BOOT_LOADER_SPECIFICATION.md">Boot Loader
+      url="https://github.com/systemd/systemd/blob/master/docs/BOOT_LOADER_SPECIFICATION.md">Boot Loader
       Specification</ulink> description files located in <filename>/loader/entries/</filename> on the ESP. These
       usually describe Linux kernel images with associated initrd images, but alternatively may also describe
       arbitrary other EFI executables.</para></listitem>
 
       <listitem><para>Unified kernel images following the <ulink
-      url="https://github.com/systemd/systemd/blob/master/doc/BOOT_LOADER_SPECIFICATION.md">Boot Loader
+      url="https://github.com/systemd/systemd/blob/master/docs/BOOT_LOADER_SPECIFICATION.md">Boot Loader
       Specification</ulink>, as executable EFI binaries in <filename>/EFI/Linux/</filename> on the ESP.
       </para></listitem>
 
@@ -231,9 +231,9 @@
     <filename>/loader/loader.conf</filename> on the ESP (in combination with data read from EFI variables). See
     <citerefentry><refentrytitle>loader.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>. Boot entry
     description files following the <ulink
-    url="https://github.com/systemd/systemd/blob/master/doc/BOOT_LOADER_SPECIFICATION.md">Boot Loader
+    url="https://github.com/systemd/systemd/blob/master/docs/BOOT_LOADER_SPECIFICATION.md">Boot Loader
     Specification</ulink> are read from <filename>/loader/entries/</filename> on the ESP. Unified kernel boot entries
-    following the <ulink url="https://github.com/systemd/systemd/blob/master/doc/BOOT_LOADER_SPECIFICATION.md">Boot
+    following the <ulink url="https://github.com/systemd/systemd/blob/master/docs/BOOT_LOADER_SPECIFICATION.md">Boot
     Loader Specification</ulink> are read from <filename>/EFI/Linux/</filename> on the ESP.</para>
   </refsect1>
 
@@ -242,7 +242,7 @@
     <para>
       <citerefentry><refentrytitle>bootctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>loader.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-      <ulink url="https://github.com/systemd/systemd/blob/master/doc/BOOT_LOADER_SPECIFICATION.md">Boot Loader Specification</ulink>,
+      <ulink url="https://github.com/systemd/systemd/blob/master/docs/BOOT_LOADER_SPECIFICATION.md">Boot Loader Specification</ulink>,
       <ulink url="https://www.freedesktop.org/wiki/Software/systemd/BootLoaderInterface">Boot Loader Interface</ulink>
     </para>
   </refsect1>
diff --git a/man/systemd-portabled.service.xml b/man/systemd-portabled.service.xml
index a6bd6c52e7..06e9ce7837 100644
--- a/man/systemd-portabled.service.xml
+++ b/man/systemd-portabled.service.xml
@@ -36,7 +36,7 @@
     <para>Most of <command>systemd-portabled</command>'s functionality is accessible through the
     <citerefentry><refentrytitle>portablectl</refentrytitle><manvolnum>1</manvolnum></citerefentry> command.</para>
 
-    <para>See the <ulink url="https://github.com/systemd/systemd/blob/master/doc/PORTABLE_SERVICES.md">Portable
+    <para>See the <ulink url="https://github.com/systemd/systemd/blob/master/docs/PORTABLE_SERVICES.md">Portable
     Services Documentation</ulink> for details about the concepts this service implements.</para>
   </refsect1>