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"
n' name='id' value='3ef0b4e402c20c245040e773e466afbb5cdcdee3'/><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=3ef0b4e402c20c245040e773e466afbb5cdcdee3'>root</a>/<a href='/guix/log/gnu?id=3ef0b4e402c20c245040e773e466afbb5cdcdee3'>gnu</a>/<a href='/guix/log/gnu/services?id=3ef0b4e402c20c245040e773e466afbb5cdcdee3'>services</a>/<a href='/guix/log/gnu/services/ganeti.scm?id=3ef0b4e402c20c245040e773e466afbb5cdcdee3'>ganeti.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/ganeti.scm?id=3ef0b4e402c20c245040e773e466afbb5cdcdee3&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-12-25 14:15:59 +0100'>2022-12-25</span></td><td><a href='/guix/commit/gnu/services/ganeti.scm?id=c97de4a989f73addcc5eae23f90084575fe83357'>services: ganeti: Label mcron jobs.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2022-12-17 17:08:50 +0100'>2022-12-17</span></td><td><a href='/guix/commit/gnu/services/ganeti.scm?id=88908c6edce845b8737a18dda415f162d699384a'>services: ganeti: Add support for cluster hooks.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2022-11-03 20:00:30 +0100'>2022-11-03</span></td><td><a href='/guix/commit/gnu/services/ganeti.scm?id=706f25f24dab13dff69e7977b5d84269c1dfa293'>services: ganeti: OS variants can be a directory.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>