diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 6d9546f..c6f6296 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -17,6 +17,7 @@ Changed
 - Mount ``/etc/pacman.d/gnupg`` on tmpfs with option ``noswap`` instead of using ramfs. This ensures there is a limit to
   the file system size.
 - Enable systemd-networkd's support for IPv6 Privacy Extensions globally instead of per-connection.
+- Moved custom ``sshd_config`` files to ``/ssh/sshd_config.d/10-archiso.conf``
 
 Deprecated
 ----------
diff --git a/configs/baseline/airootfs/etc/ssh/sshd_config b/configs/baseline/airootfs/etc/ssh/sshd_config.d/10-archiso.conf
similarity index 100%
rename from configs/baseline/airootfs/etc/ssh/sshd_config
rename to configs/baseline/airootfs/etc/ssh/sshd_config.d/10-archiso.conf
diff --git a/configs/releng/airootfs/etc/ssh/sshd_config b/configs/releng/airootfs/etc/ssh/sshd_config.d/10-archiso.conf
similarity index 100%
rename from configs/releng/airootfs/etc/ssh/sshd_config
rename to configs/releng/airootfs/etc/ssh/sshd_config.d/10-archiso.conf