diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 5b7f69a56..3a353a0f3 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -37,21 +37,7 @@
 
 find_package(Miniupnpc REQUIRED)
 
-message(STATUS "Using in-tree miniupnpc")
-set(UPNPC_NO_INSTALL TRUE CACHE BOOL "Disable miniupnp installation" FORCE)
-add_subdirectory(miniupnp/miniupnpc)
-set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external")
-set_property(TARGET libminiupnpc-static PROPERTY POSITION_INDEPENDENT_CODE ON)
-if(MSVC)
-  set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267")
-elseif(NOT MSVC)
-  set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value")
-endif()
-if(CMAKE_SYSTEM_NAME MATCHES "NetBSD")
-	set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -D_NETBSD_SOURCE")
-endif()
-
-set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE)
+set(UPNP_LIBRARIES "miniupnpc" PARENT_SCOPE)
 
 find_package(Unbound)
 
diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
index d4b39869c..13071d898 100644
--- a/src/p2p/net_node.inl
+++ b/src/p2p/net_node.inl
@@ -61,9 +61,9 @@
 #include "cryptonote_core/cryptonote_core.h"
 #include "net/parse.h"
 
-#include <miniupnp/miniupnpc/miniupnpc.h>
-#include <miniupnp/miniupnpc/upnpcommands.h>
-#include <miniupnp/miniupnpc/upnperrors.h>
+#include <miniupnpc/miniupnpc.h>
+#include <miniupnpc/upnpcommands.h>
+#include <miniupnpc/upnperrors.h>
 
 #undef MONERO_DEFAULT_LOG_CATEGORY
 #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p"
='hidden' name='id' value='0f2e8e94f16c6f71f4b27bf20bf3c9c4acea6d0a'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=0f2e8e94f16c6f71f4b27bf20bf3c9c4acea6d0a'>root</a>/<a href='/guix/log/nix?id=0f2e8e94f16c6f71f4b27bf20bf3c9c4acea6d0a'>nix</a>/<a href='/guix/log/nix/libstore?id=0f2e8e94f16c6f71f4b27bf20bf3c9c4acea6d0a'>libstore</a>/<a href='/guix/log/nix/libstore/builtins.cc?id=0f2e8e94f16c6f71f4b27bf20bf3c9c4acea6d0a'>builtins.cc</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/nix/libstore/builtins.cc?id=0f2e8e94f16c6f71f4b27bf20bf3c9c4acea6d0a&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-09-08 11:49:24 +0200'>2019-09-08</span></td><td><a href='/guix/commit/nix/libstore/builtins.cc?id=9fcc35c51fd579b3bb7b4f61cba6973675c3922c'>daemon: Run 'guix perform-download' directly.</a><span class='msg-avail'>...<span class='msg-tooltip'>* nix/scripts/download.in: Remove.
* nix/local.mk (nodist_pkglibexec_SCRIPTS): Remove 'scripts/download'.
* config-daemon.ac: Don't output 'nix/scripts/download'.
* nix/libstore/builtins.cc (builtinDownload): Invoke 'guix
perform-download' directly.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-02-04 16:20:01 +0100'>2019-02-04</span></td><td><a href='/guix/commit/nix/libstore/builtins.cc?id=959eaa1eb834fd47ceab3c5bbbe4967e808d530b'>daemon: Add "/guix" to default 'nixLibexecDir'.</a><span class='msg-avail'>...<span class='msg-tooltip'>This makes it easier to run the uninstalled daemon.

* nix/local.mk (libstore_a_CPPFLAGS): Append "/guix" to
NIX_LIBEXEC_DIR.
* build-aux/pre-inst-env.in (NIX_LIBEXEC_DIR): Adjust comment.
* nix/libstore/builtins.cc (builtinDownload): Remove SUBDIR and its
use.
* nix/libstore/local-store.cc (runAuthenticationProgram): Ditto.
* nix/libstore/gc.cc (addAdditionalRoots): Remove "/guix" prefix.
* nix/nix-daemon/guix-daemon.cc (main): Ditto.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-09-27 23:21:53 +0200'>2018-09-27</span></td><td><a href='/guix/commit/nix/libstore/builtins.cc?id=240a9c69a6064544a616acc521c993542c364948'>perform-download: Optionally report a "download-progress" trace.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/scripts/perform-download.scm (perform-download): Add
 #:print-build-trace? and pass it to 'url-fetch'.
(guix-perform-download): Define 'print-build-trace?' and pass it to
'perform-download'.
* guix/build/download.scm (ftp-fetch): Add #:print-build-trace? and
honor it.
(url-fetch): Likewise.
* nix/libstore/builtins.cc (builtinDownload): Set _NIX_OPTIONS
environment variable.
</span></span></td><td>Ludovic Courtès</td></tr>