diff --git a/packages/network/avahi/config/resolv.conf b/packages/network/avahi/config/resolv.conf
deleted file mode 100644
index bbc8559cd5..0000000000
--- a/packages/network/avahi/config/resolv.conf
+++ /dev/null
@@ -1 +0,0 @@
-nameserver 127.0.0.1
diff --git a/packages/network/avahi/config/samba.service b/packages/network/avahi/config/samba.service
deleted file mode 100644
index 5b44889bc6..0000000000
--- a/packages/network/avahi/config/samba.service
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" standalone='no'?><!--*-nxml-*-->
-<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
-<service-group>
- <name replace-wildcards="yes">%h</name>
-  <service>
-   <type>_smb._tcp</type>
-   <port>445</port>
-  </service>
-</service-group>
diff --git a/packages/sysutils/systemd/package.mk b/packages/sysutils/systemd/package.mk
index fe6ca6550e..0beb97d815 100644
--- a/packages/sysutils/systemd/package.mk
+++ b/packages/sysutils/systemd/package.mk
@@ -194,6 +194,7 @@ post_makeinstall_target() {
   rm -rf $INSTALL/usr/bin/systemd-machine-id-setup
   mkdir -p $INSTALL/usr/bin
   cp $PKG_DIR/scripts/systemd-machine-id-setup $INSTALL/usr/bin
+  cp $PKG_DIR/scripts/userconfig-setup $INSTALL/usr/bin
 
   # provide 'halt', 'shutdown', 'reboot' & co.
   mkdir -p $INSTALL/usr/sbin
diff --git a/packages/sysutils/systemd/scripts/userconfig-setup b/packages/sysutils/systemd/scripts/userconfig-setup
new file mode 100755
index 0000000000..19ce9ec563
--- /dev/null
+++ b/packages/sysutils/systemd/scripts/userconfig-setup
@@ -0,0 +1,26 @@
+#!/bin/sh
+################################################################################
+#      This file is part of LibreELEC - https://www.libreelec.tv
+#      Copyright (C) 2017-present Team LibreELEC
+#
+#  LibreELEC is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  LibreELEC 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 General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+# Remove those sample files that we manage
+for sample in $(find /storage/.config -name '*.sample' 2>/dev/null); do
+  [ -f /usr/config/${sample:16} ] && rm -f ${sample}
+done
+
+# Copy config files, but don't overwrite - this should replace our sample files
+false | cp -iRp /usr/config/* /storage/.config/ &>/dev/null
diff --git a/packages/sysutils/systemd/system.d/userconfig.service b/packages/sysutils/systemd/system.d/userconfig.service
index 1e02f8e43d..2117d8957f 100644
--- a/packages/sysutils/systemd/system.d/userconfig.service
+++ b/packages/sysutils/systemd/system.d/userconfig.service
@@ -5,7 +5,7 @@ After=systemd-tmpfiles-setup.service
 
 [Service]
 Type=oneshot
-ExecStart=/bin/sh -c "false | cp -iR /usr/config/* /storage/.config/ &>/dev/null"
+ExecStart=/usr/bin/userconfig-setup
 RemainAfterExit=yes
 
 [Install]