diff --git a/extensions/css/cgmanifest.json b/extensions/css/cgmanifest.json
index 7a81a87b30f..6e4b143b4a8 100644
--- a/extensions/css/cgmanifest.json
+++ b/extensions/css/cgmanifest.json
@@ -4,13 +4,15 @@
 			"component": {
 				"type": "git",
 				"git": {
-					"name": "atom/language-css",
-					"repositoryUrl": "https://github.com/atom/language-css",
-					"commitHash": "4a6dc90f332bfa72c88192513435a64013d9aad4"
+					"name": "microsoft/vscode-css",
+					"repositoryUrl": "https://github.com/microsoft/vscode-css",
+					"commitHash": "f9433d2d5f65d2c97ce59eba7c15d3b95960b128"
 				}
 			},
 			"licenseDetail": [
-				"Copyright (c) 2014 GitHub Inc.",
+				"MIT License",
+				"",
+				"Copyright (c) Microsoft Corporation.",
 				"",
 				"Permission is hereby granted, free of charge, to any person obtaining",
 				"a copy of this software and associated documentation files (the",
@@ -42,10 +44,10 @@
 				"express or implied warranty, and with no claim as to its",
 				"suitability for any purpose."
 			],
-			"license": "GitHub License",
+			"license": "MIT License",
 			"description": "The file syntaxes/css.tmLanguage.json was derived from https://github.com/atom/language-css which was originally converted from the TextMate bundle https://github.com/textmate/css.tmbundle.",
-			"version": "0.45.1"
+			"version": "0.0.0"
 		}
 	],
 	"version": 1
-}
\ No newline at end of file
+}
diff --git a/extensions/css/package.json b/extensions/css/package.json
index 1d299374a6f..3f2c9f95fcb 100644
--- a/extensions/css/package.json
+++ b/extensions/css/package.json
@@ -9,7 +9,7 @@
     "vscode": "0.10.x"
   },
   "scripts": {
-    "update-grammar": "node ../node_modules/vscode-grammar-updater/bin atom/language-css grammars/css.cson ./syntaxes/css.tmLanguage.json"
+    "update-grammar": "node ../node_modules/vscode-grammar-updater/bin microsoft/vscode-css grammars/css.cson ./syntaxes/css.tmLanguage.json"
   },
   "contributes": {
     "languages": [
diff --git a/extensions/css/syntaxes/css.tmLanguage.json b/extensions/css/syntaxes/css.tmLanguage.json
index 64ef1addc59..34b067948d0 100644
--- a/extensions/css/syntaxes/css.tmLanguage.json
+++ b/extensions/css/syntaxes/css.tmLanguage.json
@@ -1,10 +1,10 @@
 {
 	"information_for_contributors": [
-		"This file has been converted from https://github.com/atom/language-css/blob/master/grammars/css.cson",
+		"This file has been converted from https://github.com/microsoft/vscode-css/blob/master/grammars/css.cson",
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/atom/language-css/commit/4a6dc90f332bfa72c88192513435a64013d9aad4",
+	"version": "https://github.com/microsoft/vscode-css/commit/f9433d2d5f65d2c97ce59eba7c15d3b95960b128",
 	"name": "CSS",
 	"scopeName": "source.css",
 	"patterns": [
@@ -1862,4 +1862,4 @@
 			]
 		}
 	}
-}
\ No newline at end of file
+}