diff --git a/docs/HACKING.md b/docs/HACKING.md
index 7982be34d0..3131597c22 100644
--- a/docs/HACKING.md
+++ b/docs/HACKING.md
@@ -34,13 +34,10 @@ possible, however. In order to simplify testing for cases like this we provide
 a set of `mkosi` build files directly in the source tree. `mkosi` is a tool for
 building clean OS images from an upstream distribution in combination with a
 fresh build of the project in the local working directory. To make use of this,
-please acquire `mkosi` from https://github.com/systemd/mkosi first, unless your
-distribution has packaged it already and you can get it from there. After the
-tool is installed, symlink the settings file for your distribution of choice
-from .mkosi/ to mkosi.default in the project root directory (note that the
-package manager for this distro needs to be installed on your host system).
-After doing that, it is sufficient to type `mkosi` in the systemd project
-directory to generate a disk image `image.raw` you can boot either in
+please install the `mkosi` package (if not packaged for your distro, it can be
+downloaded from https://github.com/systemd/mkosi). `mkosi` will build an image
+for the host distro by default. It is sufficient to type `mkosi` in the systemd
+project directory to generate a disk image `image.raw` you can boot either in
 `systemd-nspawn` or in an UEFI-capable VM:
 
 ```
diff --git a/.mkosi/mkosi.arch b/mkosi.default.d/arch/mkosi.arch
similarity index 100%
rename from .mkosi/mkosi.arch
rename to mkosi.default.d/arch/mkosi.arch
diff --git a/.mkosi/mkosi.debian b/mkosi.default.d/debian/mkosi.debian
similarity index 100%
rename from .mkosi/mkosi.debian
rename to mkosi.default.d/debian/mkosi.debian
diff --git a/.mkosi/mkosi.fedora b/mkosi.default.d/fedora/mkosi.fedora
similarity index 100%
rename from .mkosi/mkosi.fedora
rename to mkosi.default.d/fedora/mkosi.fedora
diff --git a/.mkosi/mkosi.opensuse b/mkosi.default.d/opensuse/mkosi.opensuse
similarity index 100%
rename from .mkosi/mkosi.opensuse
rename to mkosi.default.d/opensuse/mkosi.opensuse
diff --git a/.mkosi/mkosi.ubuntu b/mkosi.default.d/ubuntu/mkosi.ubuntu
similarity index 100%
rename from .mkosi/mkosi.ubuntu
rename to mkosi.default.d/ubuntu/mkosi.ubuntu