diff --git a/DEVELOPERS b/DEVELOPERS
index 56e129d4f2..1f977190ab 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -969,6 +969,7 @@ F:	package/lsqlite3/
 F:	package/lua*
 F:	package/lzlib/
 F:	package/moarvm/
+F:	package/mstpd/
 F:	package/netsurf/
 F:	package/perl*
 F:	package/pkg-perl.mk
diff --git a/package/Config.in b/package/Config.in
index 3136fcc65f..2f83c87582 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -2218,6 +2218,7 @@ menu "Networking applications"
 	source "package/mosquitto/Config.in"
 	source "package/mrouted/Config.in"
 	source "package/mrp/Config.in"
+	source "package/mstpd/Config.in"
 	source "package/mtr/Config.in"
 	source "package/nbd/Config.in"
 	source "package/ncftp/Config.in"
diff --git a/package/mstpd/Config.in b/package/mstpd/Config.in
new file mode 100644
index 0000000000..5fe5859779
--- /dev/null
+++ b/package/mstpd/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_MSTPD
+	bool "mstpd"
+	help
+	  Multiple Spanning Tree Protocol Daemon.
+	  This package provides a user-space daemon which replaces
+	  the STP handling that is built into the Linux kernel Ethernet
+	  bridge and adds support for RSTP and PVST+.
+
+	  https://github.com/mstpd/mstpd
diff --git a/package/mstpd/mstpd.hash b/package/mstpd/mstpd.hash
new file mode 100644
index 0000000000..fd76b959db
--- /dev/null
+++ b/package/mstpd/mstpd.hash
@@ -0,0 +1,4 @@
+# locally computed
+sha256  91a1862548b5b509caa2e96e5fb9912bc98d4d58cc98e99a577824735756c14d  mstpd-0.0.9.tar.gz
+sha256  c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42  LICENSE
+sha256  c5cfd44652276184374adf454150d436ce958ce50acc4ef9ccb3605a5ca7a9d3  hmac_md5.c
diff --git a/package/mstpd/mstpd.mk b/package/mstpd/mstpd.mk
new file mode 100644
index 0000000000..a870352869
--- /dev/null
+++ b/package/mstpd/mstpd.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# mstpd
+#
+################################################################################
+
+MSTPD_VERSION = 0.0.9
+MSTPD_SITE = $(call github,mstpd,mstpd,$(MSTPD_VERSION))
+MSTPD_AUTORECONF = YES
+MSTPD_LICENSE = GPL-2.0, RSA Data Security (md5)
+MSTPD_LICENSE_FILES = LICENSE hmac_md5.c
+
+$(eval $(autotools-package))