diff --git a/.eslintrc b/.eslintrc
index 5aa0e5d0b2..f0a43e2c06 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -256,8 +256,10 @@
     "import/namespace": 2,
     "import/default": 2,
     "import/export": 2,
-    "import/imports-first": 2,
+    "import/first": 2,
     "import/no-duplicates": 2,
-    "import/newline-after-import": 2
+    "import/newline-after-import": 2,
+    "import/unambiguous": 2,
+    "import/extensions": [ 1, "always" ]
   }
 }
diff --git a/package.json b/package.json
index c14685b3ec..8397c1f5e5 100644
--- a/package.json
+++ b/package.json
@@ -133,7 +133,7 @@
     "chunk-manifest-webpack-plugin": "0.1.0",
     "del": "^2.2.0",
     "eslint": "^3.1.0",
-    "eslint-plugin-import": "^1.9.2",
+    "eslint-plugin-import": "^2.0.1",
     "eslint-plugin-react": "^6.2.0",
     "gulp": "^3.9.0",
     "gulp-babel": "^6.1.1",