diff --git a/packages/network/samba/default.d/samba.conf b/packages/network/samba/default.d/samba.conf
new file mode 100644
index 0000000000..b1b1483b14
--- /dev/null
+++ b/packages/network/samba/default.d/samba.conf
@@ -0,0 +1,3 @@
+SAMBA_USERNAME="openelec"
+SAMBA_PASSWORD="openelec"
+SAMBA_SECURE="false"
diff --git a/packages/network/samba/package.mk b/packages/network/samba/package.mk
index 13089f29b6..f025192631 100644
--- a/packages/network/samba/package.mk
+++ b/packages/network/samba/package.mk
@@ -177,6 +177,10 @@ makeinstall_target() {
       enable_service nmbd.service
       enable_service smbd.service
 
+    mkdir -p $INSTALL/usr/share/services
+      cp -P $PKG_DIR/default.d/*.conf $INSTALL/usr/share/services
+      enable_service samba-defaults.service
+
     mkdir -p $INSTALL/usr/lib/samba
       cp $PKG_DIR/scripts/samba-config $INSTALL/usr/lib/samba
 
diff --git a/packages/network/samba/system.d.opt/samba-config.service b/packages/network/samba/system.d.opt/samba-config.service
index 23dc1ef28c..dbe47841ec 100644
--- a/packages/network/samba/system.d.opt/samba-config.service
+++ b/packages/network/samba/system.d.opt/samba-config.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Samba configfile writer
-After=local-fs.target
+After=local-fs.target samba-defaults.service
+Requires=samba-defaults.service
 
 ConditionPathExists=/storage/.cache/services/samba.conf
 
diff --git a/packages/network/samba/system.d.opt/samba-defaults.service b/packages/network/samba/system.d.opt/samba-defaults.service
new file mode 100644
index 0000000000..db84326133
--- /dev/null
+++ b/packages/network/samba/system.d.opt/samba-defaults.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Samba defaults
+After=local-fs.target
+
+ConditionPathExists=!/storage/.cache/services/samba.conf
+ConditionPathExists=!/storage/.cache/services/samba.disabled
+
+[Service]
+Type=oneshot
+ExecStart=/bin/sh -c 'cp /usr/share/services/samba.conf /storage/.cache/services'
+RemainAfterExit=yes