diff --git a/TODO b/TODO
index 8f3060a5..82fa1abe 100644
--- a/TODO
+++ b/TODO
@@ -92,19 +92,6 @@ mac80211_hwsim
 cfg80211 / nl80211
 ==================
 
-- Bind NL80211_CMD_START_SCHED_SCAN to netlink socket
-
-  When issuing the NL80211_CMD_START_SCHED_SCAN it should be bound to the
-  executing netlink client socket.  If the application closes that netlink
-  socket the scheduled scan operation should be canceled.
-
-  Maybe a new attribute similar to NL80211_ATTR_IFACE_SOCKET_OWNER should
-  be used for this behavior.
-
-  Priority: Medium
-  Complexity: C2
-  Owner: Jukka Rissanen <jukka.rissanen@linux.intel.com>
-
 - Disconnect from network / station when client crashes
 
   When associating or connecting to a network, it should be possible to
diff --git a/doc/features.txt b/doc/features.txt
index 4187448d..6d77926d 100644
--- a/doc/features.txt
+++ b/doc/features.txt
@@ -1,4 +1,14 @@
 
+IWD
+===
+
+IWD will start a scheduled scan to the interface if the hardware supports
+that feature. If the iwd closes or dies so that the kernel netlink socket
+is closed, then the scheduled scan is cancelled automatically if the kernel
+supports this. This is done by giving NL80211_ATTR_SOCKET_OWNER netlink
+attribute when initiating the scheduled scan.
+
+
 Wireless monitor
 ================