diff --git a/.jscsrc b/.jscsrc
index 850275c..501e199 100644
--- a/.jscsrc
+++ b/.jscsrc
@@ -12,11 +12,6 @@
 	"requireSpacesInAnonymousFunctionExpression": {
 		"beforeOpeningCurlyBrace": true
 	},
-	"disallowTrailingComma": true,
-	"requireMultipleVarDecl": "onevar",
-	"disallowTrailingWhitespace": true,
-	"validateQuoteMarks": "\"",
-	"requireSpacesInsideArrayBrackets": "allButNested",
 	"excludeFiles": [
 		"node_modules/**",
 		"dist/**"
diff --git a/Gruntfile.js b/Gruntfile.js
index 7b2089a..bfc4de3 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -158,15 +158,7 @@ grunt.initConfig({
 		}
 	},
 	jscs: {
-		core: {
-			src: "<%= jshint.core.src %>"
-		},
-		test: {
-			src: "<%= jshint.test.src %>"
-		},
-		grunt: {
-			src: "<%= jshint.grunt.src %>"
-		}
+		all: [ "<%= jshint.core.src %>", "<%= jshint.test.src %>", "<%= jshint.grunt.src %>" ]
 	},
 	copy: {
 		dist: {
diff --git a/package.json b/package.json
index dca26b9..6fbd343 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
 		"grunt-contrib-qunit": "0.4.0",
 		"grunt-contrib-uglify": "0.4.0",
 		"grunt-contrib-watch": "0.6.0",
-		"grunt-jscs-checker": "^0.4.4",
+		"grunt-jscs": "^0.6.1",
 		"grunt-text-replace": "0.3.11"
 	},
 	"keywords": [