diff --git a/index.js b/index.js
index 1ad88fc..7d505ed 100644
--- a/index.js
+++ b/index.js
@@ -4,16 +4,23 @@ var loaderUtils = require('loader-utils');
 module.exports = function(source) {
   this.cacheable && this.cacheable();
 
-  var filename = loaderUtils.getRemainingRequest(this);
   var query = loaderUtils.parseQuery(this.query);
-
   if (query.insertPragma) {
-    source = '/** @jsx ' + query.insertPragma + ' */' + source;
+    source = '/** @jsx ' + query.insertPragma + ' */\n' + source;
   }
 
-  return reactTools.transform(source, {
+  var result = reactTools.transformWithDetails(source, {
     harmony: query.harmony,
-    sourceMap: query.sourceMap,
-    sourceFilename: filename
+    sourceMap: this.sourceMap
   });
-};
+
+  if (result.sourceMap) {
+    result.sourceMap.sources = [this.resourcePath];
+    result.sourceMap.sourcesContent = [source];
+  }
+
+  var code = result.code;
+  var map = result.sourceMap ? JSON.stringify(result.sourceMap) : void 0;
+
+  this.callback(null, code, map);
+};
\ No newline at end of file
diff --git a/package.json b/package.json
index 06a0b68..9de24f1 100644
--- a/package.json
+++ b/package.json
@@ -1,16 +1,19 @@
 {
   "name": "jsx-loader",
-  "version": "0.11.0-rc1",
+  "version": "0.11.0",
   "description": "JSX loader for webpack",
   "main": "index.js",
   "dependencies": {
-    "react-tools": "^0.11.0-rc1",
+    "react-tools": "^0.11.0",
     "loader-utils": "^0.2.2"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "repository": "",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/petehunt/jsx-loader"
+  },
   "keywords": [
     "webpack",
     "jsx"