diff --git a/18.md b/18.md
index 365de9c..ef77fa6 100644
--- a/18.md
+++ b/18.md
@@ -4,16 +4,18 @@ NIP-18
 Reposts
 -------
 
-`draft` `optional` `author:jb55`
+`draft` `optional` `author:fiatjaf` `author:arthurfranca`
 
 A repost is a `kind 6` note that is used to signal to followers
 that another event is worth reading.
 
-The `content` of a repost event is empty.
+The `content` of a repost event is empty. Optionally, it MAY contain
+a comment in the same format of a kind 1 note content.
 
 The repost event MUST include an `e` tag with the `id` of the note that is
 being reposted. That tag SHOULD include a relay URL as its third entry
 to indicate where it can be fetched.
+When reposting a long-form content use an `a` tag instead.
 
 The repost SHOULD include a `p` tag with the `pubkey` of the event being
 reposted.
diff --git a/README.md b/README.md
index 947ca70..ba78113 100644
--- a/README.md
+++ b/README.md
@@ -52,6 +52,7 @@ NIPs stand for **Nostr Implementation Possibilities**. They exist to document wh
 | 3             | Contacts                         | [2](02.md)  |
 | 4             | Encrypted Direct Messages        | [4](04.md)  |
 | 5             | Event Deletion                   | [9](09.md)  |
+| 6             | Reposts                          | [18](18.md) |
 | 7             | Reaction                         | [25](25.md) |
 | 8             | Badge Award                      | [58](58.md) |
 | 40            | Channel Creation                 | [28](28.md) |