diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 6b59b4cd..2d3e7717 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -715,6 +715,14 @@ LiveScript:
   filenames:
   - Slakefile
 
+Logos:
+  type: programming
+  primary_extension: .xm
+  extensions:
+  - .x
+  - .xi
+  - .xmi
+
 Logtalk:
   type: programming
   primary_extension: .lgt
diff --git a/lib/linguist/samples.json b/lib/linguist/samples.json
index 3e6f1cdf..4038a565 100644
--- a/lib/linguist/samples.json
+++ b/lib/linguist/samples.json
@@ -124,6 +124,9 @@
     "LiveScript": [
       ".ls"
     ],
+    "Logos": [
+      ".xm"
+    ],
     "Logtalk": [
       ".lgt"
     ],
@@ -352,8 +355,8 @@
       ".gemrc"
     ]
   },
-  "tokens_total": 323891,
-  "languages_total": 356,
+  "tokens_total": 323984,
+  "languages_total": 357,
   "tokens": {
     "ApacheConf": {
       "ServerSignature": 1,
@@ -20488,6 +20491,44 @@
       "<~>": 1,
       "write": 1
     },
+    "Logos": {
+      "%": 15,
+      "hook": 2,
+      "ABC": 2,
+      "-": 3,
+      "(": 8,
+      "id": 2,
+      ")": 8,
+      "a": 1,
+      "B": 1,
+      "b": 1,
+      "{": 4,
+      "log": 1,
+      ";": 8,
+      "return": 2,
+      "orig": 2,
+      "nil": 2,
+      "}": 4,
+      "end": 4,
+      "subclass": 1,
+      "DEF": 1,
+      "NSObject": 1,
+      "init": 3,
+      "[": 2,
+      "c": 1,
+      "RuntimeAccessibleClass": 1,
+      "alloc": 1,
+      "]": 2,
+      "group": 1,
+      "OptionalHooks": 2,
+      "void": 1,
+      "release": 1,
+      "self": 1,
+      "retain": 1,
+      "ctor": 1,
+      "if": 1,
+      "OptionalCondition": 1
+    },
     "Logtalk": {
       "-": 3,
       "object": 2,
@@ -33750,6 +33791,7 @@
     "Less": 39,
     "Literate CoffeeScript": 275,
     "LiveScript": 123,
+    "Logos": 93,
     "Logtalk": 36,
     "Lua": 724,
     "Markdown": 1,
@@ -33842,6 +33884,7 @@
     "Less": 1,
     "Literate CoffeeScript": 1,
     "LiveScript": 1,
+    "Logos": 1,
     "Logtalk": 1,
     "Lua": 3,
     "Markdown": 1,
@@ -33896,5 +33939,5 @@
     "Xtend": 2,
     "YAML": 1
   },
-  "md5": "ce3abfc816698694bbaf6915239057a8"
+  "md5": "06efa236d9f745b054631902026b5808"
 }
\ No newline at end of file
diff --git a/samples/Logos/example.xm b/samples/Logos/example.xm
new file mode 100644
index 00000000..39753e23
--- /dev/null
+++ b/samples/Logos/example.xm
@@ -0,0 +1,28 @@
+%hook ABC
+- (id)a:(B)b {
+	%log;
+	return %orig(nil);
+}
+%end
+
+%subclass DEF: NSObject
+- (id)init {
+	[%c(RuntimeAccessibleClass) alloc];
+	return nil;
+}
+%end
+
+%group OptionalHooks
+%hook ABC
+- (void)release {
+	[self retain];
+	%orig;
+}
+%end
+%end
+
+%ctor {
+	%init;
+	if(OptionalCondition)
+		%init(OptionalHooks);
+}