diff --git a/net-misc/wsdd/Manifest b/net-misc/wsdd/Manifest
index 6c514c6abd..3a89e728bb 100644
--- a/net-misc/wsdd/Manifest
+++ b/net-misc/wsdd/Manifest
@@ -1,2 +1,3 @@
 DIST wsdd-0.5.tar.gz 16820 BLAKE2B 3744cf45812a54d1857d75adb9ad24868f6a29520cda3de5c69877196ffafea242e3c68f54a7849c6399fb038366825c6e42a3e1e98d37c893b7c4cde7cd49c2 SHA512 fe300de7d900f34b43c81358506b2e62ecbf980e6c65b377f87e3a9618afeef9dff2ed041b660b58bce0944d221ca26b2fc1c1ff7e0155edef615ed6d5ec5cd5
+DIST wsdd-0.6.1.tar.gz 27254 BLAKE2B 745eab6f8b404d56cfa99bf4691936ac294931495990b75e29d4d28db5bef82804b1215aca76b4e2f941e8d58daee8dbbbe091ce3bfe90bc82856f6960ffec75 SHA512 62d7694972dbd571b5c5d9a2f1086bc0ba244896df237d6514b0a7cf814d11faec8299a1618e2da8550bcaee3feede3e2e057d3a1d2e7296947b09d6894ac2a2
 DIST wsdd-0.6.tar.gz 27067 BLAKE2B ea8ca4235d7a8dc32ed6cdf04f3ceeb0b41114c8fdc38beb783d839e7771d4557af0c411b1568809d1ba6a3dcdc94436a3990852b6b7f0d47eb6c0e4261a8f89 SHA512 a57a7d75118e73b63269f7de44da22ee571c922455e1be2820595209c7eabeb4c95ba6b54a56d35c5a4bf0210e05ed8578f967170728edff854cc7d40c19ef48
diff --git a/net-misc/wsdd/wsdd-0.6.1.ebuild b/net-misc/wsdd/wsdd-0.6.1.ebuild
new file mode 100644
index 0000000000..9ad926c968
--- /dev/null
+++ b/net-misc/wsdd/wsdd-0.6.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit python-r1 systemd
+
+DESCRIPTION="A Web Service Discovery host daemon."
+HOMEPAGE="https://github.com/christgau/wsdd"
+SRC_URI="https://github.com/christgau/wsdd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="samba"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+# Samba is technically no requiredment of wsdd, but depend on it if the use flags is set.
+RDEPEND="${DEPEND} samba? ( net-fs/samba )"
+BDEPEND=""
+
+src_install() {
+	python_foreach_impl python_newscript src/wsdd.py wsdd
+
+	# remove dependency on samba from init.d script if samba is not in use flags
+	if ! use samba ; then
+		sed -i -e '/need samba/d' etc/openrc/init.d/wsdd
+	fi
+
+	doinitd etc/openrc/init.d/wsdd
+	doconfd etc/openrc/conf.d/wsdd
+
+	# install systemd unit file with wsdd user and dependency on samba service if use flag is set
+	sed -i -e 's/=nobody/=daemon/' etc/systemd/wsdd.service
+	if use samba; then
+		sed -i -e 's/;Wants=smb.service/Wants=samba.service/' etc/systemd/wsdd.service
+	fi
+	systemd_dounit etc/systemd/wsdd.service
+
+	dodoc README.md
+	doman man/wsdd.1
+}