diff --git a/docs/Prevent_Tracking.txt b/docs/Prevent_Tracking.txt
index d170103f..86402110 100644
--- a/docs/Prevent_Tracking.txt
+++ b/docs/Prevent_Tracking.txt
@@ -117,8 +117,9 @@ Data sent to us:
 announce response packet:
 [uint8_t packet id (132)][data to send back in response(fixed size)][nonce]
 encrypted with the DHT private key of Node D, the public key in the request and the nonce:[[uint8_t is_stored]
-[(32 bytes) ping_id if is_stored is 0, public key that must be used to send data packets if is_stored is not 0][Node_Format * (maximum of 8)]]
+[(32 bytes) ping_id if is_stored is 0 or 2, public key that must be used to send data packets if is_stored is 1][Node_Format * (maximum of 8)]]
 (if the is_stored is not 0, it means the information to reach the client id we are searching for is stored on this node)
+is_stored is 2 as a response to a peer trying to announce himself to tell the peer that he is currently annouced successfully.
 
 data to route response packet:
 [uint8_t packet id (134)][nonce][temporary just generated public key]
diff --git a/toxcore/onion_announce.h b/toxcore/onion_announce.h
index f2ba3715..36ffe767 100644
--- a/toxcore/onion_announce.h
+++ b/toxcore/onion_announce.h
@@ -25,7 +25,7 @@
 
 #include "onion.h"
 
-#define ONION_ANNOUNCE_MAX_ENTRIES 48
+#define ONION_ANNOUNCE_MAX_ENTRIES 64
 #define ONION_ANNOUNCE_TIMEOUT 300
 #define ONION_PING_ID_SIZE crypto_hash_sha256_BYTES
 
diff --git a/toxcore/onion_client.c b/toxcore/onion_client.c
index 8f735d6c..ab7958c6 100644
--- a/toxcore/onion_client.c
+++ b/toxcore/onion_client.c
@@ -403,7 +403,7 @@ static int client_add_to_list(Onion_Client *onion_c, uint32_t num, const uint8_t
         }
 
     } else {
-        if (is_stored == 2)
+        if (is_stored >= 2)
             return -1;
 
         list_nodes = onion_c->friends_list[num - 1].clients_list;