diff --git a/packages/network/openssh/package.mk b/packages/network/openssh/package.mk
index de7e9ffb55..343c71cdf6 100644
--- a/packages/network/openssh/package.mk
+++ b/packages/network/openssh/package.mk
@@ -63,15 +63,16 @@ post_makeinstall_target() {
   rm -rf $INSTALL/usr/bin/ssh-agent
   rm -rf $INSTALL/usr/bin/ssh-keyscan
 
-  sed -i $INSTALL/etc/ssh/sshd_config -e "s|^#PermitRootLogin.*|PermitRootLogin yes|g"
+  sed -e "s|^#PermitRootLogin.*|PermitRootLogin yes|g" \
+      -e "s|^#StrictModes.*|StrictModes no|g" \
+      -e "s|^#UsePrivilegeSeparation.*|UsePrivilegeSeparation no|g" \
+      -i $INSTALL/etc/ssh/sshd_config
+
   echo "PubkeyAcceptedKeyTypes +ssh-dss" >> $INSTALL/etc/ssh/sshd_config
 
   debug_strip $INSTALL/usr
 }
 
 post_install() {
-  add_user sshd x 74 74 "Privilege-separated SSH" "/var/empty/sshd" "/bin/sh"
-  add_group sshd 74
-
   enable_service sshd.service
 }
diff --git a/packages/network/openssh/tmpfiles.d/z_04_openssh.conf b/packages/network/openssh/tmpfiles.d/z_04_openssh.conf
index 02eb3fb85c..a6212d7ac2 100644
--- a/packages/network/openssh/tmpfiles.d/z_04_openssh.conf
+++ b/packages/network/openssh/tmpfiles.d/z_04_openssh.conf
@@ -16,6 +16,5 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-d    /var/empty              0600 root root - -
 d    /storage/.cache/ssh     0755 root root - -
 d    /storage/.ssh           0700 root root - -
diff --git a/packages/sysutils/busybox/config/busybox-init.conf b/packages/sysutils/busybox/config/busybox-init.conf
index 8ff7743be3..edaf87fc06 100644
--- a/packages/sysutils/busybox/config/busybox-init.conf
+++ b/packages/sysutils/busybox/config/busybox-init.conf
@@ -217,8 +217,8 @@ CONFIG_FEATURE_TR_EQUIV=y
 # CONFIG_CAL is not set
 # CONFIG_CATV is not set
 # CONFIG_CHGRP is not set
-CONFIG_CHMOD=y
-CONFIG_CHOWN=y
+# CONFIG_CHMOD is not set
+# CONFIG_CHOWN is not set
 # CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set
 CONFIG_CHROOT=y
 # CONFIG_CKSUM is not set
diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init
index 04067a48d9..1872bdbe0f 100755
--- a/packages/sysutils/busybox/scripts/init
+++ b/packages/sysutils/busybox/scripts/init
@@ -988,10 +988,6 @@
       mount_part "/dev/$IMAGE_SYSTEM" "/sysroot" "ro,loop"
     fi
 
-    # Just in case... problems with ssh if not correctly owned
-    chown 0:0 /storage 2>/dev/null
-    chmod 755 /storage 2>/dev/null
-
     mount --move /flash /sysroot/flash
     mount --move /storage /sysroot/storage