diff --git a/extensions/json/client/tsconfig.json b/extensions/json/client/tsconfig.json
index b37b37e55dc..8cb16334377 100644
--- a/extensions/json/client/tsconfig.json
+++ b/extensions/json/client/tsconfig.json
@@ -3,8 +3,6 @@
 		"noLib": true,
 		"target": "es5",
 		"module": "commonjs",
-		"sourceMap": true,
-		"sourceRoot": "../src",
 		"outDir": "./out"
 	},
 	"exclude": [
diff --git a/extensions/php/.vscode/launch.json b/extensions/php/.vscode/launch.json
new file mode 100644
index 00000000000..476551bebae
--- /dev/null
+++ b/extensions/php/.vscode/launch.json
@@ -0,0 +1,18 @@
+{
+	"version": "0.2.0",
+	"configurations": [
+		{
+			"name": "Launch Extension",
+			"type": "extensionHost",
+			"request": "launch",
+			"runtimeExecutable": "${execPath}",
+			"args": [
+				"--extensionDevelopmentPath=${workspaceRoot}"
+			],
+			"stopOnEntry": false,
+			"sourceMaps": true,
+			"outDir": "${workspaceRoot}/out",
+			"preLaunchTask": "npm"
+		}	
+	]
+}
\ No newline at end of file
diff --git a/extensions/php/.vscode/tasks.json b/extensions/php/.vscode/tasks.json
new file mode 100644
index 00000000000..a132a04214d
--- /dev/null
+++ b/extensions/php/.vscode/tasks.json
@@ -0,0 +1,30 @@
+// Available variables which can be used inside of strings.
+// ${workspaceRoot}: the root folder of the team
+// ${file}: the current opened file
+// ${fileBasename}: the current opened file's basename
+// ${fileDirname}: the current opened file's dirname
+// ${fileExtname}: the current opened file's extension
+// ${cwd}: the current working directory of the spawned process
+
+// A task runner that calls a custom npm script that compiles the extension.
+{
+	"version": "0.1.0",
+
+	// we want to run npm
+	"command": "npm",
+
+	// the command is a shell script
+	"isShellCommand": true,
+
+	// show the output window only if unrecognized errors occur.
+	"showOutput": "silent",
+
+	// we run the custom script "compile" as defined in package.json
+	"args": ["run", "compile"],
+
+	// The tsc compiler is started in watching mode
+	"isWatching": true,
+
+	// use the standard tsc in watch mode problem matcher to find compile problems in the output.
+	"problemMatcher": "$tsc-watch"
+}
\ No newline at end of file
diff --git a/extensions/php/package.json b/extensions/php/package.json
index e56690d04ec..0d3134ffe95 100644
--- a/extensions/php/package.json
+++ b/extensions/php/package.json
@@ -2,7 +2,7 @@
 	"name": "php",
 	"version": "0.1.0",
 	"publisher": "vscode",
-	"engines": { "vscode": "*" },
+	"engines": { "vscode": "0.10.x" },
 	"activationEvents": ["onLanguage:php"],
 	"main": "./out/phpMain",
 	"dependencies": {
@@ -44,6 +44,6 @@
 		}
 	},
 	"scripts": {
-		"vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:php ./src/tsconfig.json"
+		"compile": "gulp compile-extension:php && gulp compile-extension:php"
 	}
 }
\ No newline at end of file
diff --git a/extensions/php/tsconfig.json b/extensions/php/tsconfig.json
index 1cb4fb973b0..8cb16334377 100644
--- a/extensions/php/tsconfig.json
+++ b/extensions/php/tsconfig.json
@@ -3,8 +3,7 @@
 		"noLib": true,
 		"target": "es5",
 		"module": "commonjs",
-		"sourceMap": false,
-		"outDir": "../out"
+		"outDir": "./out"
 	},
 	"exclude": [
 		"node_modules"