diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5a13654..09bd6633 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 [Unpublished]
 ----------------------
 - **New icons:** Flutter (`.flutter-plugins`), Red (updated logo)
-- **Support:** Go (`go.mod`, `go.sum`), Microsoft Excel (`.xla`, `.xlam`, `.xltm`, `.xltx`), Package (`.packages`, `pubspec.{lock,yaml}`), Separated-value file (`.prn`)
+- **Support:** Go (`go.mod`, `go.sum`), JavaScript (`.cjs`), Microsoft Excel (`.xla`, `.xlam`, `.xltm`, `.xltx`), Package (`.packages`, `pubspec.{lock,yaml}`), Separated-value file (`.prn`)
 
 
 [v2.1.29] - 2019-01-26
diff --git a/config.cson b/config.cson
index 12135c43..eeb6b58e 100644
--- a/config.cson
+++ b/config.cson
@@ -2559,6 +2559,7 @@ fileIcons:
 			[".jsm", "auto-blue"]
 			[".jss", "auto-green"]
 			[/\.es\d?$/i, "auto-yellow"]
+			[".cjs", "auto-green", alias: "CommonJS"]
 			[".mjs", "auto-blue"]
 			[".sjs", "auto-pink"]
 			[".ssjs", "auto-red"]
diff --git a/lib/icons/.icondb.js b/lib/icons/.icondb.js
index a491f36a..d84f58c6 100644
--- a/lib/icons/.icondb.js
+++ b/lib/icons/.icondb.js
@@ -832,7 +832,7 @@ module.exports = [
 ["js-icon",["medium-orange","dark-orange"],/\._js$/i],
 ["js-icon",["medium-maroon","dark-maroon"],/\.jsb$|\.jse$|\.dust$/i],
 ["js-icon",["medium-blue","dark-blue"],/\.jsm$|\.mjs$|\.xsjslib$/i],
-["js-icon",["medium-green","dark-green"],/\.jss$/i],
+["js-icon",["medium-green","dark-green"],/\.jss$|\.cjs$/i],
 ["js-icon",["medium-pink","dark-pink"],/\.sjs$/i],
 ["js-icon",["medium-red","dark-red"],/\.ssjs$|\.jscript$|\.jslib$/i],
 ["js-icon",["medium-orange","medium-orange"],/\.jspre$/i],