diff --git a/extensions/git/package.json b/extensions/git/package.json
index afd79ceaff7..25f361bad99 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -347,44 +347,7 @@
           "group": "inline"
         }
       ]
-    },
-    "languages": [
-      {
-        "id": "git-commit",
-        "aliases": [
-          "%language-alias.git-commit%",
-          "git-commit"
-        ],
-        "filenames": [
-          "COMMIT_EDITMSG",
-          "MERGE_MSG"
-        ],
-        "configuration": "./git-commit.language-configuration.json"
-      },
-      {
-        "id": "git-rebase",
-        "aliases": [
-          "%language-alias.git-rebase%",
-          "git-rebase"
-        ],
-        "filenames": [
-          "git-rebase-todo"
-        ],
-        "configuration": "./git-rebase.language-configuration.json"
-      }
-    ],
-    "grammars": [
-      {
-        "language": "git-commit",
-        "scopeName": "text.git-commit",
-        "path": "./syntaxes/git-commit.tmLanguage"
-      },
-      {
-        "language": "git-rebase",
-        "scopeName": "text.git-rebase",
-        "path": "./syntaxes/git-rebase.tmLanguage"
-      }
-    ]
+    }
   },
   "dependencies": {
     "denodeify": "^1.2.1",
diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json
index 282f4830455..01aa344df75 100644
--- a/extensions/git/package.nls.json
+++ b/extensions/git/package.nls.json
@@ -21,7 +21,5 @@
 	"command.pushTo": "Push to...",
 	"command.sync": "Sync",
 	"command.publish": "Publish",
-	"command.showOutput": "Show Git Output",
-	"language-alias.git-commit": "Git Commit Message",
-	"language-alias.git-rebase": "Git Rebase Message"
+	"command.showOutput": "Show Git Output"
 }
\ No newline at end of file
diff --git a/extensions/gitsyntax/OSSREADME.json b/extensions/gitsyntax/OSSREADME.json
new file mode 100644
index 00000000000..0e3ddd52faf
--- /dev/null
+++ b/extensions/gitsyntax/OSSREADME.json
@@ -0,0 +1,29 @@
+// ATTENTION - THIS DIRECTORY CONTAINS THIRD PARTY OPEN SOURCE MATERIALS:
+[{
+	"name": "textmate/git.tmbundle",
+	"version": "0.0.0",
+	"license": "MIT",
+	"repositoryURL": "https://github.com/textmate/git.tmbundle",
+	"licenseDetail": [
+		"Copyright (c) 2008 Tim Harper",
+		"",
+		"Permission is hereby granted, free of charge, to any person obtaining",
+		"a copy of this software and associated documentation files (the\"",
+		"Software\"), to deal in the Software without restriction, including",
+		"without limitation the rights to use, copy, modify, merge, publish,",
+		"distribute, sublicense, and/or sell copies of the Software, and to",
+		"permit persons to whom the Software is furnished to do so, subject to",
+		"the following conditions:",
+		"",
+		"The above copyright notice and this permission notice shall be",
+		"included in all copies or substantial portions of the Software.",
+		"",
+		"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,",
+		"EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF",
+		"MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND",
+		"NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE",
+		"LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION",
+		"OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION",
+		"WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
+	]
+}]
\ No newline at end of file
diff --git a/extensions/git/git-commit.language-configuration.json b/extensions/gitsyntax/git-commit.language-configuration.json
similarity index 100%
rename from extensions/git/git-commit.language-configuration.json
rename to extensions/gitsyntax/git-commit.language-configuration.json
diff --git a/extensions/git/git-rebase.language-configuration.json b/extensions/gitsyntax/git-rebase.language-configuration.json
similarity index 100%
rename from extensions/git/git-rebase.language-configuration.json
rename to extensions/gitsyntax/git-rebase.language-configuration.json
diff --git a/extensions/gitsyntax/package.json b/extensions/gitsyntax/package.json
new file mode 100644
index 00000000000..8ce5bd1ba32
--- /dev/null
+++ b/extensions/gitsyntax/package.json
@@ -0,0 +1,52 @@
+{
+  "name": "gitsyntax",
+  "publisher": "vscode",
+  "displayName": "gitsyntax",
+  "description": "Git Syntax",
+  "version": "0.0.1",
+  "engines": {
+    "vscode": "^1.5.0"
+  },
+  "categories": [
+    "Other"
+  ],
+  "contributes": {
+    "languages": [
+      {
+        "id": "git-commit",
+        "aliases": [
+          "Git Commit Message",
+          "git-commit"
+        ],
+        "filenames": [
+          "COMMIT_EDITMSG",
+          "MERGE_MSG"
+        ],
+        "configuration": "./git-commit.language-configuration.json"
+      },
+      {
+        "id": "git-rebase",
+        "aliases": [
+          "Git Rebase Message",
+          "git-rebase"
+        ],
+        "filenames": [
+          "git-rebase-todo"
+        ],
+        "configuration": "./git-rebase.language-configuration.json"
+      }
+    ],
+    "grammars": [
+      {
+        "language": "git-commit",
+        "scopeName": "text.git-commit",
+        "path": "./syntaxes/git-commit.tmLanguage"
+      },
+      {
+        "language": "git-rebase",
+        "scopeName": "text.git-rebase",
+        "path": "./syntaxes/git-rebase.tmLanguage"
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/extensions/git/syntaxes/git-commit.tmLanguage b/extensions/gitsyntax/syntaxes/git-commit.tmLanguage
similarity index 100%
rename from extensions/git/syntaxes/git-commit.tmLanguage
rename to extensions/gitsyntax/syntaxes/git-commit.tmLanguage
diff --git a/extensions/git/syntaxes/git-rebase.tmLanguage b/extensions/gitsyntax/syntaxes/git-rebase.tmLanguage
similarity index 100%
rename from extensions/git/syntaxes/git-rebase.tmLanguage
rename to extensions/gitsyntax/syntaxes/git-rebase.tmLanguage
diff --git a/extensions/git/test/colorize-fixtures/COMMIT_EDITMSG b/extensions/gitsyntax/test/colorize-fixtures/COMMIT_EDITMSG
similarity index 100%
rename from extensions/git/test/colorize-fixtures/COMMIT_EDITMSG
rename to extensions/gitsyntax/test/colorize-fixtures/COMMIT_EDITMSG
diff --git a/extensions/git/test/colorize-fixtures/git-rebase-todo b/extensions/gitsyntax/test/colorize-fixtures/git-rebase-todo
similarity index 100%
rename from extensions/git/test/colorize-fixtures/git-rebase-todo
rename to extensions/gitsyntax/test/colorize-fixtures/git-rebase-todo
diff --git a/extensions/git/test/colorize-results/COMMIT_EDITMSG.json b/extensions/gitsyntax/test/colorize-results/COMMIT_EDITMSG.json
similarity index 100%
rename from extensions/git/test/colorize-results/COMMIT_EDITMSG.json
rename to extensions/gitsyntax/test/colorize-results/COMMIT_EDITMSG.json
diff --git a/extensions/git/test/colorize-results/git-rebase-todo.json b/extensions/gitsyntax/test/colorize-results/git-rebase-todo.json
similarity index 100%
rename from extensions/git/test/colorize-results/git-rebase-todo.json
rename to extensions/gitsyntax/test/colorize-results/git-rebase-todo.json