diff --git a/36.md b/36.md
new file mode 100644
index 00000000..1223e53c
--- /dev/null
+++ b/36.md
@@ -0,0 +1,34 @@
+NIP-36
+======
+
+Sensitive Content / Content Warning
+-----------------------------------
+
+`draft` `optional` `author:fernandolguevara`
+
+The `content-warning` tag enables users to specify if the event's content needs to be approved by readers to be shown.
+Clients can hide the content until the user acts on it.
+
+#### Spec
+
+```
+tag: content-warning
+options:
+ - [reason]: optional  
+```
+
+#### Example
+
+```json
+{
+    "pubkey": "<pub-key>",
+    "created_at": 1000000000,
+    "kind": 1,
+    "tags": [
+      ["t", "hastag"],
+      ["content-warning", "reason"] /* reason is optional */
+    ],
+    "content": "sensitive content with #hastag\n",
+    "id": "<event-id>"
+}
+```
diff --git a/README.md b/README.md
index 2ab449ab..c12d523c 100644
--- a/README.md
+++ b/README.md
@@ -24,6 +24,7 @@ NIPs stand for **Nostr Implementation Possibilities**. They exist to document wh
 - [NIP-26: Delegated Event Signing](26.md)
 - [NIP-28: Public Chat](28.md)
 - [NIP-35: User Discovery](35.md)
+- [NIP-36: Sensitive Content](36.md)
 
 ## Event Kinds