diff --git a/lib/linguist/samples.json b/lib/linguist/samples.json
index 51de62c3..09b743d5 100644
--- a/lib/linguist/samples.json
+++ b/lib/linguist/samples.json
@@ -76,7 +76,8 @@
     ],
     "JSON": [
       ".maxhelp",
-      ".maxpat"
+      ".maxpat",
+      ".json"
     ],
     "Julia": [
       ".jl"
@@ -234,8 +235,8 @@
       "PKGBUILD"
     ]
   },
-  "tokens_total": 164935,
-  "languages_total": 247,
+  "tokens_total": 164972,
+  "languages_total": 250,
   "tokens": {
     "Apex": {
       "/*": 15,
@@ -9901,8 +9902,8 @@
       "logger": 2
     },
     "JSON": {
-      "{": 30,
-      "}": 30,
+      "{": 47,
+      "}": 47,
       ".0": 90,
       "fontsize": 20,
       "id": 22,
@@ -9940,7 +9941,8 @@
       "destination": 28,
       "hidden": 28,
       "midpoints": 28,
-      "presentation_rect": 1
+      "presentation_rect": 1,
+      "true": 3
     },
     "Julia": {
       "##": 5,
@@ -20082,7 +20084,7 @@
     "Ioke": 4,
     "Java": 6032,
     "JavaScript": 22985,
-    "JSON": 713,
+    "JSON": 750,
     "Julia": 173,
     "Kotlin": 149,
     "Logtalk": 23,
@@ -20152,7 +20154,7 @@
     "Ioke": 1,
     "Java": 5,
     "JavaScript": 19,
-    "JSON": 2,
+    "JSON": 5,
     "Julia": 1,
     "Kotlin": 1,
     "Logtalk": 1,
@@ -20199,5 +20201,5 @@
     "XSLT": 1,
     "YAML": 1
   },
-  "md5": "dc7a1070676887242211087f4137f22d"
+  "md5": "bf6ff91ae6d6ba38501cffb762e3b7fa"
 }
\ No newline at end of file
diff --git a/samples/JSON/person.json b/samples/JSON/person.json
new file mode 100644
index 00000000..2624199a
--- /dev/null
+++ b/samples/JSON/person.json
@@ -0,0 +1,23 @@
+{
+     "firstName": "John",
+     "lastName" : "Smith",
+     "age"      : 25,
+     "address"  :
+     {
+         "streetAddress": "21 2nd Street",
+         "city"         : "New York",
+         "state"        : "NY",
+         "postalCode"   : "10021"
+     },
+     "phoneNumber":
+     [
+         {
+           "type"  : "home",
+           "number": "212 555-1234"
+         },
+         {
+           "type"  : "fax",
+           "number": "646 555-4567"
+         }
+     ]
+ }
\ No newline at end of file
diff --git a/samples/JSON/product.json b/samples/JSON/product.json
new file mode 100644
index 00000000..2d5611a3
--- /dev/null
+++ b/samples/JSON/product.json
@@ -0,0 +1,7 @@
+{
+        "id": 1,
+        "name": "Foo",
+        "price": 123,
+        "tags": ["Bar","Eek"],
+        "stock": { "warehouse":300, "retail":20 }
+}
\ No newline at end of file
diff --git a/samples/JSON/schema.json b/samples/JSON/schema.json
new file mode 100644
index 00000000..ee580cc0
--- /dev/null
+++ b/samples/JSON/schema.json
@@ -0,0 +1,47 @@
+{
+        "name":"Product",
+        "properties":
+        {
+                "id":
+                {
+                        "type":"number",
+                        "description":"Product identifier",
+                        "required":true
+                },
+                "name":
+                {
+                        "type":"string",
+                        "description":"Name of the product",
+                        "required":true
+                },
+                "price":
+                {
+                        "type":"number",
+                        "minimum":0,
+                        "required":true
+                },
+                "tags":
+                {
+                        "type":"array",
+                        "items":
+                        {
+                                "type":"string"
+                        }
+                },
+                "stock":
+                {
+                        "type":"object",
+                        "properties":
+                        {
+                                "warehouse":
+                                {
+                                        "type":"number"
+                                },
+                                "retail":
+                                {
+                                        "type":"number"
+                                }
+                        }
+                }
+        }
+}
\ No newline at end of file