diff --git a/.yarnrc b/.yarnrc
new file mode 100644
index 000000000..24efd034b
--- /dev/null
+++ b/.yarnrc
@@ -0,0 +1 @@
+workspaces-experimental true
\ No newline at end of file
diff --git a/lerna.json b/lerna.json
index 34c9af290..7f5b1c80c 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,7 +1,8 @@
 {
-  "lerna": "2.0.0-beta.32",
-  "packages": [
-    "packages/*"
-  ],
-  "version": "independent"
-}
+  "lerna": "2.9.0",
+  "packages": ["packages/*"],
+  "npmClient": "yarn",
+  "useWorkspaces": true,
+  "version": "independent",
+  "registry": "https://registry.npmjs.org/"
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index b6eea874f..f31a0f7b3 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "devDependencies": {
     "coveralls": "^2.11.2",
     "jest": "^18.1.0",
-    "lerna": "2.0.0-beta.32",
+    "lerna": "2.9.0",
     "prettier": "^1.3.1"
   },
   "repository": {
@@ -12,9 +12,9 @@
     "url": "https://github.com/pugjs/pug.git"
   },
   "scripts": {
+    "bootstrap": "lerna bootstrap",
     "clean": "lerna clean",
     "release": "lerna publish",
-    "postinstall": "lerna bootstrap",
     "pretest": "lerna run pretest",
     "test": "jest",
     "coverage": "jest --coverage",
@@ -28,5 +28,6 @@
       "./scripts/prettier-javascript-serializer.js"
     ]
   },
-  "license": "MIT"
+  "license": "MIT",
+  "workspaces": ["packages/*"]
 }