diff --git a/ChangeLog b/ChangeLog
index a8fd705..e37c357 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -255,6 +255,13 @@ Version 1.8.0
 Version 1.6.14
 *******************************************************************************
 
+2011-10-24 Fabrice Fontaine <fabrice.fontaine(at)orange.com>
+
+	Bug fix in IN6_IS_ADDR_GLOBAL.
+
+	Changing IN6_IS_ADDR_GLOBAL to accept all IPv6 addresses which have a
+	2000::/3 prefix.
+
 2011-07-20 Marc Essayan <marc.essayan(at)orange-ftgroup.com>
 
 	Bug Fix on M-SEARCH.
diff --git a/upnp/src/api/upnpapi.c b/upnp/src/api/upnpapi.c
index 9fa067f..5340371 100644
--- a/upnp/src/api/upnpapi.c
+++ b/upnp/src/api/upnpapi.c
@@ -79,8 +79,8 @@
 
 #ifndef IN6_IS_ADDR_GLOBAL
 #define IN6_IS_ADDR_GLOBAL(a) \
-		(((((__const uint8_t *) (a))[0] & htonl(0xff000000)) <= htonl(0x3f000000)   \
-				&& (((__const uint8_t *) (a))[0] & htonl(0xff000000)) >= htonl(0x20000000)))
+		((((__const uint32_t *) (a))[0] & htonl(0x70000000)) \
+		== htonl (0x20000000))
 #endif /* IS ADDR GLOBAL */
 
 #ifndef IN6_IS_ADDR_ULA