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"
='id' value='518265744938d0aac20dfbcb922484ece9ddc02d'/><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=518265744938d0aac20dfbcb922484ece9ddc02d'>root</a>/<a href='/guix/log/emacs?id=518265744938d0aac20dfbcb922484ece9ddc02d'>emacs</a>/<a href='/guix/log/emacs/guix-prettify.el?id=518265744938d0aac20dfbcb922484ece9ddc02d'>guix-prettify.el</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/emacs/guix-prettify.el?id=518265744938d0aac20dfbcb922484ece9ddc02d&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2014-11-07 14:58:15 +0300'>2014-11-07</span></td><td><a href='/guix/commit/emacs/guix-prettify.el?id=9a130e19fcb46a15bf6ab5ceea08a9ec092bbb34'>emacs: Add 'guix-prettify'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* emacs/guix-prettify.el: New file.
* emacs.am (ELFILES): Add it.
* doc/emacs.texi (Emacs Prettify): New node.
* doc/guix.texi (Features): Mention it.
</span></span></td><td>Alex Kost</td></tr>
></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-06-05 23:10:37 +0200'>2019-06-05</span></td><td><a href='/guix/commit/gnu/build/accounts.scm?id=ed8570dce3683b73bdf668b3ad0f529a1cea30c5'>accounts: Close database before renaming it.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;https://bugs.gnu.org/35996&gt;.
Reported by Florian Pelz &lt;pelzflorian@pelzflorian.de&gt;.

* gnu/build/accounts.scm (database-writer): Move 'close-port' call
before 'rename-file'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-06-05 23:10:36 +0200'>2019-06-05</span></td><td><a href='/guix/commit/gnu/build/accounts.scm?id=d497b6ab397273cd250003b6266f22ad74f4c20d'>activation: Lock /etc/.pwd.lock before accessing databases.</a><span class='msg-avail'>...<span class='msg-tooltip'>Suggested by Florian Pelz &lt;pelzflorian@pelzflorian.de&gt;
in &lt;http://bugs.gnu.org/35996&gt;.

* gnu/build/accounts.scm (%password-lock-file): New variable.
* gnu/build/activation.scm (activate-users+groups): Wrap calls to
'user+group-databases', 'write-group', etc. into 'with-file-lock'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-04-26 14:19:36 +0200'>2019-04-26</span></td><td><a href='/guix/commit/gnu/build/accounts.scm?id=504a0fc636ec591e65b4a229a37e522e425d8a0c'>accounts: Always honor the configured user account shell.</a><span class='msg-avail'>...<span class='msg-tooltip'>Starting from commit 0ae735bcc8ff7fdc89d67b492bdee9091ee19e86, Guix
System would preserve the user shell across reconfigure and reboot.
This was done so as to allow for the use of 'chsh'.

This proved to be a misguided decision.  This commit goes back to
considering user shells as config and not "state."

* gnu/build/accounts.scm (allocate-passwd): Do not use shell from
PREVIOUS.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-03-07 20:05:09 +0100'>2019-03-07</span></td><td><a href='/guix/commit/gnu/build/accounts.scm?id=ec600e4544729f1aaf46fa5162bba334515d0de5'>Add (gnu build accounts).</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/build/accounts.scm, tests/accounts.scm: New files.
* Makefile.am (SCM_TESTS): Add tests/accounts.scm.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add build/accounts.scm.
</span></span></td><td>Ludovic Courtès</td></tr>