diff --git a/ChangeLog b/ChangeLog
index 26da6e9..b0b1bdf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -318,6 +318,12 @@ Version 1.8.0
 Version 1.6.16
 *******************************************************************************
 
+2012-03-15 Fabrice Fontaine <fabrice.fontaine(at)orange.com>
+
+	Fix previous commit
+
+	Replace HAVE_UPNP_OPTSSDP by UPNP_HAVE_OPTSSDP in upnpapi.c.
+
 2012-03-15 Fabrice Fontaine <fabrice.fontaine(at)orange.com>
 
 	Add --disable-optssdp option
diff --git a/upnp/src/api/upnpapi.c b/upnp/src/api/upnpapi.c
index 68e6c96..3d033a8 100644
--- a/upnp/src/api/upnpapi.c
+++ b/upnp/src/api/upnpapi.c
@@ -179,10 +179,10 @@ int UpnpSdkDeviceRegisteredV4 = 0;
  * == 0 if unregistered, == 1 if registered. */
 int UpnpSdkDeviceregisteredV6 = 0;
 
-#ifdef HAVE_UPNP_OPTSSDP
+#ifdef UPNP_HAVE_OPTSSDP
 /*! Global variable used in discovery notifications. */
 Upnp_SID gUpnpSdkNLSuuid;
-#endif /* HAVE_UPNP_OPTSSDP */
+#endif /* UPNP_HAVE_OPTSSDP */
 
 /*! Global variable used as to store the OpenSSL context object
  * to be used for all SSL/TLS connections