diff --git a/net-misc/dleyna-server/dleyna-server-0.5.0.ebuild b/net-misc/dleyna-server/dleyna-server-0.5.0.ebuild
index 1490e084d6952..fa4a5748ab65d 100644
--- a/net-misc/dleyna-server/dleyna-server-0.5.0.ebuild
+++ b/net-misc/dleyna-server/dleyna-server-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -29,6 +29,12 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
+src_prepare() {
+	# Fix build with recent gupnp, bug #597952
+	epatch "${FILESDIR}"/${P}-fix-references-to-GUPnPContextManager.patch
+	default
+}
+
 src_install() {
 	default
 	prune_libtool_files
diff --git a/net-misc/dleyna-server/files/dleyna-server-0.5.0-fix-references-to-GUPnPContextManager.patch b/net-misc/dleyna-server/files/dleyna-server-0.5.0-fix-references-to-GUPnPContextManager.patch
new file mode 100644
index 0000000000000..9efb1feb19067
--- /dev/null
+++ b/net-misc/dleyna-server/files/dleyna-server-0.5.0-fix-references-to-GUPnPContextManager.patch
@@ -0,0 +1,13 @@
+Fix build with recent gupnp version
+
+Gentoo-Bug: 597952
+--- a/libdleyna/server/upnp.h
++++ b/libdleyna/server/upnp.h
+@@ -24,6 +24,7 @@
+ #define DLS_UPNP_H__
+ 
+ #include <libdleyna/core/connector.h>
++#include <libgupnp/gupnp-context-manager.h>
+ 
+ #include "client.h"
+ #include "async.h"