diff --git a/package/mpd/Config.in b/package/mpd/Config.in
index ed0df7f00a..ac9ca95235 100644
--- a/package/mpd/Config.in
+++ b/package/mpd/Config.in
@@ -265,6 +265,14 @@ config BR2_PACKAGE_MPD_TCP
 
 	  You want this on if mpd and the client(s) work
 	  on different machines (the usual scenario).
+
+config BR2_PACKAGE_MPD_UPNP
+	bool "UPnp"
+	select BR2_PACKAGE_EXPAT
+	select BR2_PACKAGE_LIBUPNP
+	help
+	  Enable mpd UPnP client support.
+
 endif
 
 comment "mpd needs a toolchain w/ C++, threads, wchar"
diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk
index b3ff6f5c38..d7b912bd28 100644
--- a/package/mpd/mpd.mk
+++ b/package/mpd/mpd.mk
@@ -199,6 +199,13 @@ else
 MPD_CONF_OPTS += --disable-twolame-encoder
 endif
 
+ifeq ($(BR2_PACKAGE_MPD_UPNP),y)
+MPD_DEPENDENCIES += expat libupnp
+MPD_CONF_OPTS += --enable-upnp
+else
+MPD_CONF_OPTS += --disable-upnp
+endif
+
 ifeq ($(BR2_PACKAGE_MPD_VORBIS),y)
 MPD_DEPENDENCIES += libvorbis
 MPD_CONF_OPTS += --enable-vorbis --enable-vorbis-encoder