diff --git a/bin/fai-make-nfsroot b/bin/fai-make-nfsroot
index 735a3f763..8e13c8948 100755
--- a/bin/fai-make-nfsroot
+++ b/bin/fai-make-nfsroot
@@ -223,8 +223,7 @@ setup_ssh() {
     [ -f $NFSROOT/usr/bin/ssh ] || return 0
 
     # enable root login
-    sed -i -e '/PermitRootLogin/d' $NFSROOT/etc/ssh/sshd_config
-    ainsl $NFSROOT/etc/ssh/sshd_config 'PermitRootLogin yes'
+    ainsl -a $NFSROOT/etc/ssh/sshd_config.d/PermitRootLogin.conf 'PermitRootLogin yes'
 
     if [ $sshpreserve -ge 1 ]; then
         tar -C $NFSROOT -xf $tmptar