diff --git a/contrib/src/upnp/rules.mak b/contrib/src/upnp/rules.mak
index 31073aa6ca09c987bea4604a51fadfd8007f6a69..5d995c7bb5b246458752ec054c6f8d19035fa98c 100644
--- a/contrib/src/upnp/rules.mak
+++ b/contrib/src/upnp/rules.mak
@@ -25,10 +25,10 @@ endif
 .upnp: upnp
 ifdef HAVE_WIN32
 	$(RECONF)
-	cd $< && $(HOSTVARS) CFLAGS="-DUPNP_STATIC_LIB" ./configure --disable-largefile --disable-samples --without-documentation --disable-blocking_tcp_connections $(HOSTCONF)
+	cd $< && $(HOSTVARS) CFLAGS="-DUPNP_STATIC_LIB" ./configure --disable-largefile --disable-samples --without-documentation $(HOSTCONF)
 else
 	$(RECONF)
-	cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -DUPNP_STATIC_LIB" ./configure --disable-largefile --disable-samples --without-documentation --disable-blocking_tcp_connections $(HOSTCONF)
+	cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -DUPNP_STATIC_LIB" ./configure --disable-largefile --disable-samples --without-documentation $(HOSTCONF)
 endif
 	cd $< && $(MAKE) install
 	touch $@
diff --git a/src/upnp/protocol/pupnp/pupnp.h b/src/upnp/protocol/pupnp/pupnp.h
index 77c136ddc938904688b7bd68a7c2c4ec79564a00..b479267c1eb5a24597c511911575b662f7cf66a4 100644
--- a/src/upnp/protocol/pupnp/pupnp.h
+++ b/src/upnp/protocol/pupnp/pupnp.h
@@ -68,7 +68,7 @@ constexpr static int ARRAY_IDX_INVALID = 713;
 constexpr static int CONFLICT_IN_MAPPING = 718;
 
 // Timeout values (in seconds).
-constexpr static unsigned int SEARCH_TIMEOUT {30};
+constexpr static unsigned int SEARCH_TIMEOUT {5};
 constexpr static unsigned int SUBSCRIBE_TIMEOUT {300};
 
 class PUPnP : public UPnPProtocol