diff --git a/HISTORY.md b/HISTORY.md
index 93b2afeb7..60e5d3e65 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -3,6 +3,7 @@ unreleased
 
   * Add glTF types and extensions
   * Add new upstream MIME types
+  * Add `text/x-org`
 
 1.29.0 / 2017-07-10
 ===================
diff --git a/db.json b/db.json
index 6e3433118..7220ed3cb 100644
--- a/db.json
+++ b/db.json
@@ -6509,6 +6509,10 @@
     "source": "apache",
     "extensions": ["opml"]
   },
+  "text/x-org": {
+    "compressible": true,
+    "extensions": ["org"]
+  },
   "text/x-pascal": {
     "source": "apache",
     "extensions": ["p","pas"]
diff --git a/src/custom-types.json b/src/custom-types.json
index d82eb966b..d04429e5b 100644
--- a/src/custom-types.json
+++ b/src/custom-types.json
@@ -682,6 +682,14 @@
     "compressible": true,
     "extensions": ["mkd"]
   },
+  "text/x-org": {
+    "compressible": true,
+    "extensions": ["org"],
+    "sources": [
+      "https://lists.gnu.org/archive/html/emacs-orgmode/2011-01/msg00971.html",
+      "http://orgmode.org"
+    ]
+  },
   "text/x-processing": {
     "compressible": true,
     "extensions": ["pde"],