diff --git a/TODO b/TODO
index 70091052..878a6278 100644
--- a/TODO
+++ b/TODO
@@ -30,21 +30,6 @@ mac80211_hwsim
   Priority: Low
   Complexity: C1
 
-- Add support for client tracking of HWSIM_CMD_CREATE_RADIO
-
-  When using HWSIM_CMD_CREATE_RADIO command the newly created radio is
-  not bound to the owner of the netlink socket.  This means that the radio
-  stays around even after the client quits.  For testing tools it would
-  be beneficial if the newly created radio could be bound to the lifetime
-  of the netlink socket.
-
-  Create a new HWSIM_ATTR_DESTROY_RADIO_ON_CLOSE (netlink flag attribute)
-  that can be given to HWSIM_CMD_CREATE_RADIO to indicate this behavior.
-
-  Priority: High
-  Complexity: C1
-  Owner: Jukka Rissanen <jukka.rissanen@linux.intel.com>
-
 - Rename HWSIM_CMD_CREATE_RADIO into HWSIM_CMD_NEW_RADIO
 
   Using the name HWSIM_CMD_NEW_RADIO is more fitting on how other pieces
diff --git a/doc/features.txt b/doc/features.txt
index ca95a171..5c5004c8 100644
--- a/doc/features.txt
+++ b/doc/features.txt
@@ -21,3 +21,10 @@ The radio id from kernel mac80211_hwsim module is parsed properly in
 hwsim. The radio id is not returned as HWSIM_ATTR_RADIO_ID but instead
 it is returned in error message. If the error code > 0, then that means
 the radio id. If the error code < 0, then that indicates a real error.
+
+The hwsim uses new HWSIM_ATTR_DESTROY_RADIO_ON_CLOSE flag attribute to
+tell the kernel that when the hwsim process dies, the radios it created
+should be removed. For testing tools it is beneficial if the newly
+created radio could be bound to the lifetime of the netlink socket.
+The old behaviour i.e., radio is not destroyed when hwsim quits,
+is used if one starts the hwsim with -k (--keep) command line option.