diff --git a/ChangeLog b/ChangeLog
index d81c599..649d3e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,14 @@
 Version 1.6.17
 *******************************************************************************
 
+2012-03-26 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
+
+	SF Bug Tracker id 3510693 - build fail with --disable-device
+
+	Use INCLUDE_DEVICE_APIS instead of UPNP_HAVE_DEVICE as in other sources.
+	Don't use soap_device_callback if INCLUDE_DEVICE_APIS is not set,
+	otherwise link error occur on Windows.
+
 2012-03-26 Fabrice Fontaine <fabrice.fontaine(at)orange.com>
 
 	SF Bug Tracker id 3511149 - --disable-ssdp has no effect
diff --git a/upnp/src/api/upnpapi.c b/upnp/src/api/upnpapi.c
index b8b6f4f..136d9e9 100644
--- a/upnp/src/api/upnpapi.c
+++ b/upnp/src/api/upnpapi.c
@@ -358,9 +358,11 @@ static int UpnpInitPreamble(void)
 		return retVal;
 	}
 
+#ifdef INCLUDE_DEVICE_APIS
 #if EXCLUDE_SOAP == 0
 	SetSoapCallback(soap_device_callback);
 #endif
+#endif /* INCLUDE_DEVICE_APIS */
 
 #if EXCLUDE_GENA == 0
 	SetGenaCallback(genaCallback);
@@ -3729,7 +3731,7 @@ Upnp_Handle_Type GetDeviceHandleInfo(
 	UpnpDevice_Handle *device_handle_out,
 	struct Handle_Info **HndInfo)
 {
-#ifdef UPNP_HAVE_DEVICE
+#ifdef INCLUDE_DEVICE_APIS
 	/* Check if we've got a registered device of the address family specified. */
 	if ((AddressFamily == AF_INET  && UpnpSdkDeviceRegisteredV4 == 0) ||
 	    (AddressFamily == AF_INET6 && UpnpSdkDeviceregisteredV6 == 0)) {
@@ -3749,7 +3751,7 @@ Upnp_Handle_Type GetDeviceHandleInfo(
 			break;
 		}
 	}
-#endif /* UPNP_HAVE_DEVICE */
+#endif /* INCLUDE_DEVICE_APIS */
 
 	*device_handle_out = -1;
 	return HND_INVALID;