diff --git a/package/skeleton-init-finit/skeleton/etc/bridge-stp.conf b/package/skeleton-init-finit/skeleton/etc/bridge-stp.conf
new file mode 100644
index 00000000..ccfef53b
--- /dev/null
+++ b/package/skeleton-init-finit/skeleton/etc/bridge-stp.conf
@@ -0,0 +1,3 @@
+# Daemon is managed by finit(1), /sbin/bridge-stp should assume that
+# it is already running and simply add/remove bridges as necessary
+MANAGE_MSTPD='n'
diff --git a/package/skeleton-init-finit/skeleton/etc/default/mstpd b/package/skeleton-init-finit/skeleton/etc/default/mstpd
new file mode 100644
index 00000000..4afe12e9
--- /dev/null
+++ b/package/skeleton-init-finit/skeleton/etc/default/mstpd
@@ -0,0 +1,3 @@
+# -d: Do _not_ [sic] daemonize
+# -s: Log to syslog
+MSTPD_ARGS="-d -s"
diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/mstpd.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/mstpd.conf
index bae2749b..d2278d50 100644
--- a/package/skeleton-init-finit/skeleton/etc/finit.d/available/mstpd.conf
+++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/mstpd.conf
@@ -1,4 +1,4 @@
-# Make sure to configure the bridge to run on before starting mstpd
-# Note: all 'sysv' type services are handed an extra 'start' or 'stop'
-# argument when starting and stopping.
-sysv name:mstpd [0123456] pid:!/run/mstpd.pid bridge-stp br0 -- MSTP daemon
+# A single mstpd instance can manage multiple bridges, which are
+# dynamically added/removed by the kernel via the /sbin/bridge-stp
+# usermode helper.
+service [S0123456789] env:-/etc/default/mstpd mstpd $MSTPD_ARGS -- Spanning Tree daemon