diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index c84dfe6c8e..928eeda31e 100755
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1975,6 +1975,7 @@ JSX:
   type: programming
   group: JavaScript
   extensions:
+  - ".js"
   - ".jsx"
   tm_scope: source.js.jsx
   ace_mode: javascript
diff --git a/samples/JSX/sample.js b/samples/JSX/sample.js
new file mode 100644
index 0000000000..2020618d4a
--- /dev/null
+++ b/samples/JSX/sample.js
@@ -0,0 +1,23 @@
+'use strict';
+
+const React = require('react')
+
+module.exports = React.createClass({
+  render: function() {
+    let {feeds, log} = this.props;
+
+    log.info(feeds);
+    return <div className="feed-list">
+      <h3>News Feed's</h3>
+      <ul>
+        {feeds.map(function(feed) {
+          return <li key={feed.name} className={feed.fetched ? 'loaded' : 'loading'}>
+            {feed.data && feed.data.length > 0 ?
+              <span>{feed.name} <span className='light'>({feed.data.length})</span></span>
+              : 'feed.name' }
+          </li>
+        })}
+      </ul>
+    </div>;
+  }
+});