diff --git a/Makefile b/Makefile
index e54aa8cb6..b1a740a95 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,21 @@
+NO_COLOR=\x1b[0m
+OK_COLOR=\x1b[32;01m
+ERROR_COLOR=\x1b[31;01m
+WARN_COLOR=\x1b[33;01m
+
 all:
 	@mkdir -p bin/
 	go get -d -v ./...
+	@echo "$(OK_COLOR)--> Compiling Packer...$(NO_COLOR)"
 	go build -v -o bin/packer
+	@echo "$(OK_COLOR)--> Compiling Command: Build...$(NO_COLOR)"
+	$(MAKE) -C plugin/command-build
 
 format:
 	go fmt ./...
 
 test:
+	@echo "$(OK_COLOR)--> Testing Packer...$(NO_COLOR)"
 	@go list -f '{{range .TestImports}}{{.}}\
 		{{end}}' ./... | xargs -n1 go get -d
 	go test ./...
diff --git a/command/build/command.go b/command/build/command.go
index a4762fc74..601ea78ff 100644
--- a/command/build/command.go
+++ b/command/build/command.go
@@ -1,8 +1,8 @@
-package main
+package build
 
 import "github.com/mitchellh/packer/packer"
 
-type buildCommand byte
+type Command byte
 
 func (Command) Run(env packer.Environment, arg []string) int {
 	env.Ui().Say("BUILDING!")
diff --git a/command/build/command_test.go b/command/build/command_test.go
new file mode 100644
index 000000000..e45b793cb
--- /dev/null
+++ b/command/build/command_test.go
@@ -0,0 +1,3 @@
+package build
+
+
diff --git a/command/build/main.go b/command/build/main.go
deleted file mode 100644
index 5fa53f2fe..000000000
--- a/command/build/main.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package main
-
-import "github.com/mitchellh/packer/packer/plugin"
-
-func main() {
-	plugin.ServeCommand(new(buildCommand))
-}
diff --git a/plugin/command-build/Makefile b/plugin/command-build/Makefile
new file mode 100644
index 000000000..e1ee4fe9f
--- /dev/null
+++ b/plugin/command-build/Makefile
@@ -0,0 +1,13 @@
+plugin:
+	go get -d -v ./...
+	go build -v -o $(CURDIR)/bin/packer-build
+
+format:
+	go fmt ./...
+
+test:
+	@go list -f '{{range .TestImports}}{{.}}\
+		{{end}}' ./... | xargs -n1 go get -d
+	go test ./...
+
+.PHONY: all format test
diff --git a/plugin/command-build/bin/packer-build b/plugin/command-build/bin/packer-build
new file mode 100755
index 000000000..10d913598
Binary files /dev/null and b/plugin/command-build/bin/packer-build differ
diff --git a/plugin/command-build/main.go b/plugin/command-build/main.go
new file mode 100644
index 000000000..e6a4397fd
--- /dev/null
+++ b/plugin/command-build/main.go
@@ -0,0 +1,10 @@
+package main
+
+import (
+	"github.com/mitchellh/packer/command/build"
+	"github.com/mitchellh/packer/packer/plugin"
+)
+
+func main() {
+	plugin.ServeCommand(new(build.Command))
+}