diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 7553f87e..8e865c6c 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -37,19 +37,7 @@
 
 find_package(Miniupnpc REQUIRED)
 
-message(STATUS "Using in-tree miniupnpc")
-add_subdirectory(miniupnp/miniupnpc)
-set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external")
-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 74924e4f..3554dd0d 100644
--- a/src/p2p/net_node.inl
+++ b/src/p2p/net_node.inl
@@ -49,9 +49,9 @@
 #include "storages/levin_abstract_invoke2.h"
 #include "cryptonote_core/cryptonote_core.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"
'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/services/mail.scm'>
<input type='hidden' name='id' value='2ba5253044a4c4f9b5dbdd2ce5684e43f8d43c30'/><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=2ba5253044a4c4f9b5dbdd2ce5684e43f8d43c30'>root</a>/<a href='/guix/log/gnu?id=2ba5253044a4c4f9b5dbdd2ce5684e43f8d43c30'>gnu</a>/<a href='/guix/log/gnu/services?id=2ba5253044a4c4f9b5dbdd2ce5684e43f8d43c30'>services</a>/<a href='/guix/log/gnu/services/mail.scm?id=2ba5253044a4c4f9b5dbdd2ce5684e43f8d43c30'>mail.scm</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/gnu/services/mail.scm?id=2ba5253044a4c4f9b5dbdd2ce5684e43f8d43c30&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-03-16 14:05:52 +0100'>2020-03-16</span></td><td><a href='/guix/commit/gnu/services/mail.scm?id=a37e03d60e18dfcf119d0b92d9008e54fc350bf1'>tests: opensmtpd: Check /var/spool/mail instead of /var/mail.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-01-31 00:42:48 +0100'>2020-01-31</span></td><td><a href='/guix/commit/gnu/services/mail.scm?id=c3f146e79aca0efec5c0cbbf4e39c79e09268c15'>gnu: Update opensmtpd configuration grammar.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2019-09-21 16:48:36 +0200'>2019-09-21</span></td><td><a href='/guix/commit/gnu/services/mail.scm?id=ad34409e8581f8ad0273ddec277575fc112e1604'>services: dovecot: Fix predicate names for free-form fields</a><span class='msg-avail'>...</span></td><td>Alexey Abramov</td></tr>
<tr><td><span title='2019-06-20 15:54:51 +0200'>2019-06-20</span></td><td><a href='/guix/commit/gnu/services/mail.scm?id=ace8e269a40b31a9c6f413c0674529880da6a48e'>services: opensmtpd: Extend the PAM service.</a><span class='msg-avail'>...</span></td><td>Kristofer Buffington</td></tr>
<tr><td><span title='2019-06-20 10:43:25 +0200'>2019-06-20</span></td><td><a href='/guix/commit/gnu/services/mail.scm?id=f7dbf186b4fbe49bcfe22494804c9e3176a3dd0e'>services: Fix typo in (gnu services mail) exports.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2019-05-07 20:52:02 +0100'>2019-05-07</span></td><td><a href='/guix/commit/gnu/services/mail.scm?id=5b3d3cf71c1947bb43237b28d231d249f9dfbe49'>services: dovecot: Rename auth-verbose-passwords?.</a><span class='msg-avail'>...</span></td><td>Christopher Baines</td></tr>
<tr><td><span title='2019-04-07 14:18:01 +0800'>2019-04-07</span></td><td><a href='/guix/commit/gnu/services/mail.scm?id=412e6396bbb8b398e8a94427db50271e47db610f'>services: Add 'imap4d-service-type'.</a><span class='msg-avail'>...</span></td><td>宋文武</td></tr>
<tr><td><span title='2019-03-13 23:12:43 +0100'>2019-03-13</span></td><td><a href='/guix/commit/gnu/services/mail.scm?id=59e80445882f8b0379e54916f89510c0deda6698'>Remove traces of "GuixSD".</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>