diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index ad4c8fa7..1a0cee50 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1514,6 +1514,13 @@ PHP:
   filenames:
   - Phakefile
 
+Pan:
+  type: programming
+  lexer: Text only
+  color: '#cc0000'
+  extensions:
+  - .pan
+
 Parrot:
   type: programming
   color: "#f3ca0a"
diff --git a/lib/linguist/samples.json b/lib/linguist/samples.json
index d6cf090d..e22338c9 100644
--- a/lib/linguist/samples.json
+++ b/lib/linguist/samples.json
@@ -390,6 +390,9 @@
     "Oxygene": [
       ".oxygene"
     ],
+    "Pan": [
+      ".pan"
+    ],
     "Parrot Assembly": [
       ".pasm"
     ],
@@ -717,8 +720,8 @@
       ".gemrc"
     ]
   },
-  "tokens_total": 610981,
-  "languages_total": 753,
+  "tokens_total": 611111,
+  "languages_total": 754,
   "tokens": {
     "ABAP": {
       "*/**": 1,
@@ -47929,6 +47932,69 @@
       "</None>": 1,
       "</Project>": 1
     },
+    "Pan": {
+      "object": 1,
+      "template": 1,
+      "pantest": 1,
+      ";": 32,
+      "xFF": 1,
+      "e": 2,
+      "-": 2,
+      "E10": 1,
+      "variable": 4,
+      "TEST": 2,
+      "to_string": 1,
+      "(": 8,
+      ")": 8,
+      "+": 2,
+      "value": 1,
+      "undef": 1,
+      "null": 1,
+      "error": 1,
+      "include": 1,
+      "{": 5,
+      "}": 5,
+      "pkg_repl": 2,
+      "PKG_ARCH_DEFAULT": 1,
+      "function": 1,
+      "show_things_view_for_stuff": 1,
+      "thing": 2,
+      "ARGV": 1,
+      "[": 2,
+      "]": 2,
+      "foreach": 1,
+      "i": 1,
+      "mything": 2,
+      "STUFF": 1,
+      "if": 1,
+      "return": 2,
+      "true": 2,
+      "else": 1,
+      "SELF": 1,
+      "false": 2,
+      "HERE": 1,
+      "<<": 1,
+      "EOF": 2,
+      "This": 1,
+      "example": 1,
+      "demonstrates": 1,
+      "an": 1,
+      "in": 1,
+      "line": 1,
+      "heredoc": 1,
+      "style": 1,
+      "config": 1,
+      "file": 1,
+      "main": 1,
+      "awesome": 1,
+      "small": 1,
+      "#This": 1,
+      "should": 1,
+      "be": 1,
+      "highlighted": 1,
+      "normally": 1,
+      "again.": 1
+    },
     "Parrot Assembly": {
       "SHEBANG#!parrot": 1,
       ".pcc_sub": 1,
@@ -66202,6 +66268,7 @@
     "Org": 358,
     "Ox": 1006,
     "Oxygene": 157,
+    "Pan": 130,
     "Parrot Assembly": 6,
     "Parrot Internal Representation": 5,
     "Pascal": 30,
@@ -66385,6 +66452,7 @@
     "Org": 1,
     "Ox": 3,
     "Oxygene": 1,
+    "Pan": 1,
     "Parrot Assembly": 1,
     "Parrot Internal Representation": 1,
     "Pascal": 1,
@@ -66454,5 +66522,5 @@
     "YAML": 2,
     "Zephir": 2
   },
-  "md5": "a80808140f91c6a5539bdca53d5e114a"
+  "md5": "b604e4795dbaebe4811c710a78423b0f"
 }
\ No newline at end of file
diff --git a/samples/Pan/test.pan b/samples/Pan/test.pan
new file mode 100644
index 00000000..56c8bd62
--- /dev/null
+++ b/samples/Pan/test.pan
@@ -0,0 +1,54 @@
+object template pantest;
+
+# Very simple pan test file
+"/long/decimal" = 123;
+"/long/octal" = 0755;
+"/long/hexadecimal" = 0xFF;
+
+"/double/simple" = 0.01;
+"/double/pi" = 3.14159;
+"/double/exponent" = 1e-8;
+"/double/scientific" = 1.3E10;
+
+"/string/single" = 'Faster, but escapes like \t, \n and \x3d don''t work, but '' should work.';
+"/string/double" = "Slower, but escapes like \t, \n and \x3d do work";
+
+variable TEST = 2;
+
+"/x2" = to_string(TEST);
+"/x2" ?= 'Default value';
+
+"/x3" = 1 + 2 + value("/long/decimal");
+
+"/x4" = undef;
+
+"/x5" = null;
+
+variable e ?= error("Test error message");
+
+# include gmond config for services-monitoring
+include { 'site/ganglia/gmond/services-monitoring' };
+
+"/software/packages"=pkg_repl("httpd","2.2.3-43.sl5.3",PKG_ARCH_DEFAULT);
+"/software/packages"=pkg_repl("php");
+
+# Example function
+function show_things_view_for_stuff = {
+    thing = ARGV[0];
+    foreach( i; mything; STUFF ) {
+        if ( thing == mything ) {
+            return( true );
+        } else {
+            return SELF;
+        };
+    };
+    false;
+};
+
+variable HERE = <<EOF;
+; This example demonstrates an in-line heredoc style config file
+[main]
+awesome = true
+EOF
+
+variable small = false;#This should be highlighted normally again.