diff --git a/packages/babel-cli/bin/babel-plugin/index.js b/packages/babel-cli/bin/babel-plugin/index.js
index ff304fd93c..b44ba4b100 100755
--- a/packages/babel-cli/bin/babel-plugin/index.js
+++ b/packages/babel-cli/bin/babel-plugin/index.js
@@ -107,7 +107,7 @@ var cmds = {
   },
 
   build: function () {
-    spawn("babel", ["src", "--out-dir", "lib"]);
+    spawn("babel", ["src", "--out-dir", "lib", "--copy-files"]);
   },
 
   publish: function () {
diff --git a/src/babel/transformation/file/plugin-manager.js b/src/babel/transformation/file/plugin-manager.js
index f701092b74..ac0e312874 100644
--- a/src/babel/transformation/file/plugin-manager.js
+++ b/src/babel/transformation/file/plugin-manager.js
@@ -1,10 +1,12 @@
 import Transformer from "../transformer";
 import Plugin from "../plugin";
 import * as types from "../../types";
+import * as messages from "../../messages";
 import traverse from "../../types";
 import parse from "../../helpers/parse";
 
 var context = {
+  messages,
   Transformer,
   Plugin,
   types,
@@ -12,7 +14,6 @@ var context = {
   traverse
 };
 
-import * as messages from "../../messages";
 import * as util from  "../../util";
 
 export default class PluginManager {