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/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);
+}