diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 9498c1ff..50540a6e 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -747,6 +747,10 @@ JSON:
   - .sublime_session
   - .sublime-settings
   - .sublime-workspace
+  - .maxpat
+  - .maxhelp
+  - .maxpresets
+  - .maxproj
   filenames:
   - composer.lock
 
@@ -944,7 +948,7 @@ Matlab:
 Max:
   type: programming
   color: "#ce279c"
-  lexer: Text only
+  lexer: JSON
   aliases:
   - max/msp
   - maxmsp
@@ -952,8 +956,9 @@ Max:
   primary_extension: .maxpat
   extensions:
   - .maxhelp
-  - .mxt
-  - .pat
+  - .maxproj
+  - .mxt # Legacy
+  - .pat # Legacy
 
 MiniD: # Legacy
   searchable: false
diff --git a/samples/JSON/Hello.maxhelp b/samples/Max/Hello.maxhelp
similarity index 100%
rename from samples/JSON/Hello.maxhelp
rename to samples/Max/Hello.maxhelp
diff --git a/samples/JSON/Hello.maxpat b/samples/Max/Hello.maxpat
similarity index 100%
rename from samples/JSON/Hello.maxpat
rename to samples/Max/Hello.maxpat