diff --git a/net-p2p/feather/feather-2.8.1-r1.ebuild b/net-p2p/feather/feather-2.8.1-r1.ebuild
index fefc44d765..7a5f51193b 100644
--- a/net-p2p/feather/feather-2.8.1-r1.ebuild
+++ b/net-p2p/feather/feather-2.8.1-r1.ebuild
@@ -23,7 +23,7 @@ DEPEND="
 	dev-libs/libsodium:=
 	media-gfx/qrencode:=
 	media-gfx/zbar:=[v4l]
-	~dev-libs/polyseed-1.0.0
+	~dev-libs/polyseed-2.0.0
 	dev-libs/libzip:=
 	dev-libs/boost:=[nls]
 	>=dev-qt/qtbase-6.9.1:6[wayland=]
@@ -35,7 +35,7 @@ DEPEND="
 	dev-libs/openssl:=
 	net-dns/unbound:=[threads]
 	net-libs/czmq:=
-	qrcode? ( media-libs/zxing-cpp )
+	qrcode? ( media-libs/zxing-cpp dev-util/bc-ur )
 "
 RDEPEND="
 	${DEPEND}
@@ -53,6 +53,7 @@ src_prepare() {
 	default
 	echo "#define FEATHER_VERSION \"${PV}\"" > "${WORKDIR}"/${P}/src/config-feather.h || die
 	echo "#define TOR_VERSION \"NOT_EMBEDDED\"" >> "${WORKDIR}"/${P}/src/config-feather.h || die
+	rm -r "${WORKDIR}"/${P}/src/third-party || die
 	if ! use wayland; then
 		eapply "${FILESDIR}/feather-no-wayland.patch"
 	fi
diff --git a/net-p2p/feather/feather-9999.ebuild b/net-p2p/feather/feather-9999.ebuild
index 93a34a8167..bf8c4804d5 100644
--- a/net-p2p/feather/feather-9999.ebuild
+++ b/net-p2p/feather/feather-9999.ebuild
@@ -18,7 +18,7 @@ DEPEND="
 	dev-libs/libsodium:=
 	media-gfx/qrencode:=
 	media-gfx/zbar:=[v4l]
-	~dev-libs/polyseed-1.0.0
+	~dev-libs/polyseed-2.0.0
 	dev-libs/libzip:=
 	dev-libs/boost:=[nls]
 	>=dev-qt/qtbase-6.7.3:6
@@ -30,7 +30,7 @@ DEPEND="
 	dev-libs/openssl:=
 	net-dns/unbound:=[threads]
 	net-libs/czmq:=
-	qrcode? ( media-libs/zxing-cpp )
+	qrcode? ( media-libs/zxing-cpp dev-util/bc-ur )
 "
 RDEPEND="
 	${DEPEND}
@@ -41,6 +41,11 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+src_prepare() {
+	rm -r "${WORKDIR}"/${P}/src/third-party || die
+	cmake_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_BUILD_TYPE=Release