diff --git a/net-im/swift/files/swift-4.0.3-miniupnpc.patch b/net-im/swift/files/swift-4.0.3-miniupnpc.patch
new file mode 100644
index 0000000000000..db717ff1213b2
--- /dev/null
+++ b/net-im/swift/files/swift-4.0.3-miniupnpc.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/934054
+
+From: Bill Prendergast <dek.devel@baisenvar.info>
+
+Fix build with newer net-libs/miniupnpc (API 18)
+--- a/Swiften/Network/MiniUPnPInterface.cpp
++++ b/Swiften/Network/MiniUPnPInterface.cpp
+@@ -45,9 +45,16 @@ MiniUPnPInterface::MiniUPnPInterface() : p(new Private()) {
+     }
+ 
+     char lanAddress[64];
++#if MINIUPNPC_API_VERSION > 17
++    char wanAddress[64];
++    if (!UPNP_GetValidIGD(p->deviceList, &p->urls, &p->data, lanAddress, sizeof(lanAddress), wanAddress, sizeof(wanAddress))) {
++        return;
++    }
++#else
+     if (!UPNP_GetValidIGD(p->deviceList, &p->urls, &p->data, lanAddress, sizeof(lanAddress))) {
+         return;
+     }
++#endif
+     p->localAddress = std::string(lanAddress);
+     p->isValid = true;
+ }
diff --git a/net-im/swift/swift-4.0.3-r2.ebuild b/net-im/swift/swift-4.0.3-r2.ebuild
index 792b487871ed3..8a2cbafdea9e3 100644
--- a/net-im/swift/swift-4.0.3-r2.ebuild
+++ b/net-im/swift/swift-4.0.3-r2.ebuild
@@ -61,6 +61,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.0.3-libxml2-2.12-compatibility.patch
 	"${WORKDIR}"/${PN}-4.0.3-python3-compatibility.patch
 	"${FILESDIR}"/${PN}-4.0.3-reproducible-build.patch
+	"${FILESDIR}"/${PN}-4.0.3-miniupnpc.patch
 )
 
 pkg_setup() {
@@ -77,6 +78,9 @@ src_prepare() {
 	# Use correct LIBDIR for Lua
 	sed -e "s/lib/$(get_libdir)/g" -i Sluift/SConscript.variant || die
 
+	# bug #933871
+	sed -i -e 's:c++11:c++17:g' BuildTools/SCons/SConscript.boot || die
+
 	# Hack for finding Qt system libs
 	mkdir "${T}"/qt || die
 	ln -s "${EPREFIX}"/usr/$(get_libdir)/qt5/bin "${T}"/qt/bin || die