diff --git a/NEWS b/NEWS
index d82e2b19d..998836c38 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 ver 0.20.13 (not yet released)
 * database
   - simple: don't purge mount points on update/rescan
+  - upnp: work around libupnp 1.6.24 API breakage
 
 ver 0.20.12 (2017/11/25)
 * database
diff --git a/src/lib/upnp/Compat.hxx b/src/lib/upnp/Compat.hxx
index 2e2d2f1de..c9f1cc47f 100644
--- a/src/lib/upnp/Compat.hxx
+++ b/src/lib/upnp/Compat.hxx
@@ -23,12 +23,15 @@
 #include <upnp/upnp.h>
 
 #if UPNP_VERSION < 10800
-#include "Compiler.h"
-
 /* emulate the libupnp 1.8 API with older versions */
 
 using UpnpDiscovery = Upnp_Discovery;
 
+#endif
+
+#if UPNP_VERSION < 10624
+#include "Compiler.h"
+
 gcc_pure
 static inline int
 UpnpDiscovery_get_Expires(const UpnpDiscovery *disco) noexcept