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/packages/cups.scm'>
<input type='hidden' name='id' value='ca3cc238e7b073e700a0b66209b27bf7a7e2cdaf'/><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=ca3cc238e7b073e700a0b66209b27bf7a7e2cdaf'>root</a>/<a href='/guix/log/gnu?id=ca3cc238e7b073e700a0b66209b27bf7a7e2cdaf'>gnu</a>/<a href='/guix/log/gnu/packages?id=ca3cc238e7b073e700a0b66209b27bf7a7e2cdaf'>packages</a>/<a href='/guix/log/gnu/packages/cups.scm?id=ca3cc238e7b073e700a0b66209b27bf7a7e2cdaf'>cups.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/packages/cups.scm?id=ca3cc238e7b073e700a0b66209b27bf7a7e2cdaf&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-11-19 01:00:00 +0100'>2023-11-19</span></td><td><a href='/guix/commit/gnu/packages/cups.scm?id=392de3262ef388ec282d4311a7c2954e86e5aac9'>gnu: hplip: Update to 3.23.12.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2023-11-19 01:00:00 +0100'>2023-11-19</span></td><td><a href='/guix/commit/gnu/packages/cups.scm?id=3a0440c3f986f4f4bd66ff0d78664016b7aeac90'>gnu: cups-minimal/fixed: Update to 2.4.7.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2023-10-26 11:30:01 +0200'>2023-10-26</span></td><td><a href='/guix/commit/gnu/packages/cups.scm?id=23376668339b126b0270bcfcea9d9044903ff05e'>gnu: cups: Fix cross-compiling.</a><span class='msg-avail'>...</span></td><td>Zheng Junjie</td></tr>
<tr><td><span title='2023-10-25 11:59:58 +0200'>2023-10-25</span></td><td><a href='/guix/commit/gnu/packages/cups.scm?id=1e5ec9d853b89f6a142a4128e9fff6e2d48213d5'>gnu: hplip: Fix USB timeouts.</a><span class='msg-avail'>...</span></td><td>Bruno Victal</td></tr>
<tr><td><span title='2023-09-24 02:00:00 +0200'>2023-09-24</span></td><td><a href='/guix/commit/gnu/packages/cups.scm?id=4a8c51c7be9ea22803a79d7214571718e5ff9bf2'>gnu: hplip: Update to 3.23.8.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>