diff --git a/gengo/languages.yaml b/gengo/languages.yaml
index ab01b9a3..f410e6d3 100644
--- a/gengo/languages.yaml
+++ b/gengo/languages.yaml
@@ -614,6 +614,12 @@ OpenSCAD:
   matchers:
     extensions:
       - scad
+Org:
+  category: prose
+  color: "#77AA99"
+  matchers:
+    extensions:
+      - org
 PHP:
   category: programming
   color: "#7A86B8"
diff --git a/samples-test/samples/Org/org.org b/samples-test/samples/Org/org.org
new file mode 100644
index 00000000..7074b2cc
--- /dev/null
+++ b/samples-test/samples/Org/org.org
@@ -0,0 +1,32 @@
+* Org
+** Text
+
+Paragraphs are blocks of text. They are separated by a new line.
+
+See? This is a new paragraph.
+
+Text can by styled. /Italicize/ with a slash or *bold* with asterisks,
+or mark something as ~code~ with tildes.
+
+-----
+
+Oh, and you can separate with 5 hyphens.
+
+** Lists
+
++ unordered
++ with
++ plus symbol
+
+1. order
+2. with
+3. numbers
+
+-----
+
+Go to [[https://example.com][a link]]!
+
+#+begin_quote
+The syntax for blocks is too weird to describe in text. Just read this file's source
+code.
+#+end_quote