diff --git a/mkosi.arch b/.mkosi/mkosi.arch
similarity index 100%
rename from mkosi.arch
rename to .mkosi/mkosi.arch
diff --git a/.mkosi/mkosi.fedora b/.mkosi/mkosi.fedora
new file mode 100644
index 00000000000..0af20c924ae
--- /dev/null
+++ b/.mkosi/mkosi.fedora
@@ -0,0 +1,71 @@
+# This file is part of systemd.
+#
+# Copyright 2016 Lennart Poettering
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <http://www.gnu.org/licenses/>.
+
+# This is a settings file for OS image generation using mkosi (https://github.com/systemd/mkosi).
+# Simply invoke "mkosi" in the project directory to build an OS image.
+
+[Distribution]
+Distribution=fedora
+Release=25
+
+[Output]
+Format=raw_btrfs
+Bootable=yes
+
+[Partitions]
+RootSize=2G
+
+[Packages]
+BuildPackages=
+        audit-libs-devel
+        autoconf
+        automake
+        bzip2-devel
+        cryptsetup-devel
+        dbus-devel
+        docbook-style-xsl
+        elfutils-devel
+        gcc
+        git
+        gnu-efi
+        gnu-efi-devel
+        gnutls-devel
+        gperf
+        intltool
+        iptables-devel
+        kmod-devel
+        libacl-devel
+        libblkid-devel
+        libcap-devel
+        libcurl-devel
+        libgcrypt-devel
+        libidn-devel
+        libmicrohttpd-devel
+        libmount-devel
+        libseccomp-devel
+        libselinux-devel
+        libtool
+        libxkbcommon-devel
+        libxslt
+        lz4-devel
+        make
+        pam-devel
+        pkgconfig
+        python3-devel
+        python3-lxml
+        qrencode-devel
+        xz-devel
diff --git a/mkosi.build b/mkosi.build
index 09d835d45b4..94a6667e42f 100755
--- a/mkosi.build
+++ b/mkosi.build
@@ -20,7 +20,6 @@
 # This is a build script for OS image generation using mkosi (https://github.com/systemd/mkosi).
 # Simply invoke "mkosi" in the project directory to build an OS image.
 
-git clean -dfqx
 ./autogen.sh c
 make -j `nproc`
 make install
diff --git a/mkosi.default b/mkosi.default
deleted file mode 100644
index 1c161df8361..00000000000
--- a/mkosi.default
+++ /dev/null
@@ -1,72 +0,0 @@
-# This file is part of systemd.
-#
-# Copyright 2016 Lennart Poettering
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# systemd is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with systemd; If not, see <http://www.gnu.org/licenses/>.
-
-# This is a settings file for OS image generation using mkosi (https://github.com/systemd/mkosi).
-# Simply invoke "mkosi" in the project directory to build an OS image.
-
-[Distribution]
-Distribution=fedora
-Release=24
-
-[Output]
-Format=raw_btrfs
-Bootable=yes
-
-[Partitions]
-RootSize=2G
-
-[Packages]
-Cache=/var/tmp/dnf-cache
-BuildPackages=
-        audit-libs-devel
-        autoconf
-        automake
-        bzip2-devel
-        cryptsetup-devel
-        dbus-devel
-        docbook-style-xsl
-        elfutils-devel
-        gcc
-        git
-        gnu-efi
-        gnu-efi-devel
-        gnutls-devel
-        gperf
-        intltool
-        iptables-devel
-        kmod-devel
-        libacl-devel
-        libblkid-devel
-        libcap-devel
-        libcurl-devel
-        libgcrypt-devel
-        libidn-devel
-        libmicrohttpd-devel
-        libmount-devel
-        libseccomp-devel
-        libselinux-devel
-        libtool
-        libxkbcommon-devel
-        libxslt
-        lz4-devel
-        make
-        pam-devel
-        pkgconfig
-        python3-devel
-        python3-lxml
-        qrencode-devel
-        xz-devel
diff --git a/mkosi.default b/mkosi.default
new file mode 120000
index 00000000000..2718c9e2a0d
--- /dev/null
+++ b/mkosi.default
@@ -0,0 +1 @@
+.mkosi/mkosi.fedora
\ No newline at end of file