diff --git a/doc/mgmt-api.txt b/doc/mgmt-api.txt
index cf7ef83..66df988 100644
--- a/doc/mgmt-api.txt
+++ b/doc/mgmt-api.txt
@@ -189,7 +189,8 @@ Remove Keys Command
 	Controller Index:	<controller id>
 	Command Parameters:	Address (6 Octets)
 				Disconnect (1 Octet)
-	Return Parameters:
+	Return Parameters:	Address (6 Octets)
+				Status (1 Octet)
 
 	Removes all keys associated with the remote device.
 
diff --git a/lib/mgmt.h b/lib/mgmt.h
index 28ff756..10a4bd6 100644
--- a/lib/mgmt.h
+++ b/lib/mgmt.h
@@ -129,6 +129,10 @@ struct mgmt_cp_remove_keys {
 	bdaddr_t bdaddr;
 	uint8_t disconnect;
 } __packed;
+struct mgmt_rp_remove_keys {
+	bdaddr_t bdaddr;
+	uint8_t status;
+} __packed;
 
 #define MGMT_OP_DISCONNECT		0x000F
 struct mgmt_cp_disconnect {