diff --git a/config/webpack.config.dev.js b/config/webpack.config.dev.js
index 5a5a2ff6122..a07d0771d65 100644
--- a/config/webpack.config.dev.js
+++ b/config/webpack.config.dev.js
@@ -13,6 +13,7 @@ var webpack = require('webpack');
 var HtmlWebpackPlugin = require('html-webpack-plugin');
 var CaseSensitivePathsPlugin = require('case-sensitive-paths-webpack-plugin');
 var paths = require('./paths');
+var CheckJSXFile = require('warning-require-jsx-file');
 
 module.exports = {
   devtool: 'eval',
@@ -107,6 +108,7 @@ module.exports = {
     new webpack.DefinePlugin({ 'process.env.NODE_ENV': '"development"' }),
     // Note: only CSS is currently hot reloaded
     new webpack.HotModuleReplacementPlugin(),
+    new CheckJSXFile(),
     new CaseSensitivePathsPlugin()
   ]
 };
diff --git a/package.json b/package.json
index 15eaec52374..36014b47d31 100644
--- a/package.json
+++ b/package.json
@@ -69,6 +69,7 @@
     "rimraf": "2.5.4",
     "style-loader": "0.13.1",
     "url-loader": "0.5.7",
+    "warning-require-jsx-file": "^1.0.0",
     "webpack": "1.13.1",
     "webpack-dev-server": "1.14.1",
     "whatwg-fetch": "1.0.0"