diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 0f2481d7..cb69ea8d 100755
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1385,6 +1385,14 @@ Game Maker Language:
   codemirror_mode: clike
   codemirror_mime_type: text/x-c++src
   language_id: 125
+Genie:
+  type: programming
+  ace_mode: text
+  extensions:
+  - ".gs"
+  color: "#fb855d"
+  tm_scope: none
+  language_id: 792408528
 Genshi:
   type: programming
   extensions:
diff --git a/samples/Genie/Class.gs b/samples/Genie/Class.gs
new file mode 100644
index 00000000..61eb1b7e
--- /dev/null
+++ b/samples/Genie/Class.gs
@@ -0,0 +1,12 @@
+init
+	new Demo( "Demonstration class" ).run()
+
+class Demo
+	_message:string = ""
+
+	construct ( message:string = "Optional argument - no message passed in constructor" )
+		_message = message
+
+	def run()
+		print( _message )
+		
diff --git a/samples/Genie/Hello.gs b/samples/Genie/Hello.gs
new file mode 100644
index 00000000..72fa1208
--- /dev/null
+++ b/samples/Genie/Hello.gs
@@ -0,0 +1,2 @@
+init
+	print( "Hello, World!" )