diff --git a/.travis.yml b/.travis.yml
index cc4dba2..c39ba4f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,9 @@
 language: node_js
+before_script:
+  # Tests require that hbsfy is requireable by its name. We cannot use relative
+  # require calls because 'require("hbsfy/runtime");' will be compiled in to
+  # the browserify bundles.
+  - sudo npm link
 node_js:
   - "0.8"
   - "0.10"
diff --git a/README.md b/README.md
index e7d48d4..655dfc5 100644
--- a/README.md
+++ b/README.md
@@ -4,8 +4,8 @@
 
 [Handlebars][] precompiler plugin for [Browserify v2][] without magic.
 
-Compiles Handlebars templates to plain Javascript. The compiled templates
-depend only on [handlebars-runtime][] so they are lightweight and fast!
+Compiles Handlebars templates to plain Javascript. The compiled templates only
+have one copy of the Handlebars runtime so they are lightweight and fast!
 
 ## Usage
 
@@ -13,7 +13,7 @@ Install hbsfy locally to your project:
 
     npm install hbsfy
 
-Handlebars runtime will be automatically installed as [peer dependency][].
+Handlebars will be automatically installed as [peer dependency][].
 
 Then use it as Browserify transform module with `-t`:
 
@@ -38,7 +38,7 @@ To register custom helpers just require the runtime use and `registerHelper` to
 create helper:
 
 ```javascript
-var Handlebars = require("handlebars-runtime");
+var Handlebars = require("hbsfy/runtime");
 Handlebars.registerHelper("upcase", function(s) {
   return s.toUpperCase();
 });
@@ -55,6 +55,16 @@ Handlebars.registerPartial('link', require("./partial.hbs"));
 
 Checkout the example folder for details.
 
+## Changelog
+
+### 1.0.0
+
+  - Remove `handlebars-runtime` dependency and dependency directly on
+    `handlebars` module as [peer dependency][].
+  - Runtime must be now required with `require("hbsfy/runtime")` instead of
+    `require("handlebars-runtime")`.
+  - Thanks to @kamicane for teaching me how to do this.
+
 ## Browserify?
 
 <https://github.com/substack/node-browserify>
@@ -63,5 +73,4 @@ Further reading: <http://esa-matti.suuronen.org/blog/2013/03/22/journey-from-req
 
 [Handlebars]: http://handlebarsjs.com/
 [Browserify v2]: https://github.com/substack/node-browserify
-[handlebars-runtime]: https://npmjs.org/package/handlebars-runtime
 [peer dependency]: http://blog.nodejs.org/2013/02/07/peer-dependencies/
diff --git a/index.js b/index.js
index c2f6453..56117ca 100644
--- a/index.js
+++ b/index.js
@@ -14,7 +14,7 @@ module.exports = function(file) {
   function() {
     var js = Handlebars.precompile(buffer);
     // Compile only with the runtime dependency.
-    var compiled = "var Handlebars = require('handlebars-runtime');\n";
+    var compiled = "var Handlebars = require('hbsfy/runtime');\n";
     compiled += "module.exports = Handlebars.template(" + js.toString() + ");\n";
     this.queue(compiled);
     this.queue(null);
diff --git a/package.json b/package.json
index 5144151..c045404 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,10 @@
 {
   "name": "hbsfy",
-  "version": "0.1.5",
+  "version": "1.0.0",
   "description": "Handlebars precompiler plugin for Browserify v2",
   "main": "index.js",
   "scripts": {
-    "test": "node test/test.js"
+    "test": "sh test.sh"
   },
   "repository": {
     "type": "git",
@@ -21,14 +21,13 @@
   "author": "Esa-Matti Suuronen",
   "license": "MIT",
   "dependencies": {
-    "through": "~2.2.7",
-    "handlebars": "~1.0.12"
+    "through": "~2.2.7"
   },
   "peerDependencies": {
-    "handlebars-runtime": "~1.0.12"
+    "handlebars": "~1.0.12"
   },
   "devDependencies": {
-    "browserify": "~2.4.0",
-    "handlebars-runtime": "~1.0.12"
+    "browserify": "~2.35.1",
+    "concat-stream": "~1.1.0"
   }
-}
\ No newline at end of file
+}
diff --git a/runtime.js b/runtime.js
new file mode 100644
index 0000000..269b296
--- /dev/null
+++ b/runtime.js
@@ -0,0 +1,11 @@
+var hbsBase = require("handlebars/lib/handlebars/base");
+var hbsUtils = require("handlebars/lib/handlebars/utils");
+var hbsRuntime = require("handlebars/lib/handlebars/runtime");
+
+var Handlebars = hbsBase.create();
+hbsUtils.attach(Handlebars);
+hbsRuntime.attach(Handlebars);
+
+module.exports = Handlebars;
+
+// module.exports = require("handlebars");
diff --git a/test.sh b/test.sh
new file mode 100755
index 0000000..b84a235
--- /dev/null
+++ b/test.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -eu
+
+cd test/
+npm link hbsfy
+node test.js
+node browserify_test.js
+
diff --git a/test/browsercode.js b/test/browsercode.js
new file mode 100644
index 0000000..0ad9341
--- /dev/null
+++ b/test/browsercode.js
@@ -0,0 +1,12 @@
+
+var Handlebars = require("hbsfy/runtime");
+
+Handlebars.registerHelper("upcase", function(s) {
+  return s.toUpperCase();
+});
+
+var template = require("./hello.hbs");
+
+document.body.innerHTML = template({
+    msg: "hello"
+});
diff --git a/test/browserify_test.js b/test/browserify_test.js
new file mode 100644
index 0000000..e0de748
--- /dev/null
+++ b/test/browserify_test.js
@@ -0,0 +1,26 @@
+
+var concat = require("concat-stream");
+var browserify = require("browserify");
+var assert = require("assert");
+var vm = require("vm");
+
+var b = browserify(__dirname + "/browsercode.js");
+b.transform(require("hbsfy"));
+
+// Browser mock
+var context = {
+    document: {
+        body: {}
+    }
+};
+
+b.bundle().pipe(concat(function(data) {
+    console.log("Bundle size", data.length);
+    assert(data.length < 15000, "Bundle is too big! Maybe full Handlebars got compiled in?");
+    vm.runInNewContext(data.toString(), context);
+}));
+
+setTimeout(function() {
+    assert.equal(context.document.body.innerHTML.trim(), "<h1>HELLO</h1>");
+}, 400);
+
diff --git a/test/test.js b/test/test.js
index c7fec9b..028a163 100644
--- a/test/test.js
+++ b/test/test.js
@@ -3,8 +3,8 @@
 var fs = require("fs");
 var assert = require("assert");
 
-var hbsfy = require("../index");
-var Handlebars = require("handlebars-runtime");
+var hbsfy = require("hbsfy");
+var Handlebars = require("hbsfy/runtime");
 
 Handlebars.registerHelper("upcase", function(s) {
   return s.toUpperCase();