diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 340c7682..4a4df48f 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -767,6 +767,12 @@ Idris:
   extensions:
   - .lidr
 
+Inform 7:
+  type: programming
+  primary_extension: .ni
+  extensions:
+  - .i7x
+
 Inno Setup:
   primary_extension: .iss
   lexer: Text only
diff --git a/samples/Inform 7/Trivial Extension.i7x b/samples/Inform 7/Trivial Extension.i7x
new file mode 100644
index 00000000..1aae1b85
--- /dev/null
+++ b/samples/Inform 7/Trivial Extension.i7x	
@@ -0,0 +1,6 @@
+Version 1 of Trivial Extension by Andrew Plotkin begins here.
+
+A cow is a kind of animal. A cow can be purple.
+
+Trivial Extension ends here.
+
diff --git a/samples/Inform 7/story.ni b/samples/Inform 7/story.ni
new file mode 100644
index 00000000..f8873369
--- /dev/null
+++ b/samples/Inform 7/story.ni	
@@ -0,0 +1,12 @@
+"Test Case" by Andrew Plotkin.
+
+Include Trivial Extension by Andrew Plotkin.
+
+The Kitchen is a room.
+
+[This kitchen is modelled after the one in Zork, although it lacks the detail to establish this to the player.]
+
+A purple cow called Gelett is in the Kitchen.
+
+Instead of examining Gelett:
+	say "You'd rather see than be one."