diff --git a/Makefile b/Makefile
index ef05d62ca..97a5924b4 100644
--- a/Makefile
+++ b/Makefile
@@ -3,23 +3,18 @@ OK_COLOR=\x1b[32;01m
 ERROR_COLOR=\x1b[31;01m
 WARN_COLOR=\x1b[33;01m
 
-export ROOTDIR=$(CURDIR)
-
 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 Builder: Amazon EBS...$(NO_COLOR)"
-	$(MAKE) -C plugin/builder-amazon-ebs
-	@echo "$(OK_COLOR)--> Compiling Command: Build...$(NO_COLOR)"
-	$(MAKE) -C plugin/command-build
+	@echo "$(OK_COLOR)==> Installing dependencies$(NO_COLOR)"
+	@go get -d -v ./...
+	@echo "$(OK_COLOR)==> Building$(NO_COLOR)"
+	@./build.sh
 
 format:
 	go fmt ./...
 
 test:
-	@echo "$(OK_COLOR)--> Testing Packer...$(NO_COLOR)"
+	@echo "$(OK_COLOR)==> Testing Packer...$(NO_COLOR)"
 	@go list -f '{{range .TestImports}}{{.}}\
 		{{end}}' ./... | xargs -n1 go get -d
 	go test ./...
diff --git a/build.sh b/build.sh
new file mode 100755
index 000000000..be03913d8
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+set -e
+
+NO_COLOR="\x1b[0m"
+OK_COLOR="\x1b[32;01m"
+ERROR_COLOR="\x1b[31;01m"
+WARN_COLOR="\x1b[33;01m"
+
+
+# Compile the main Packer app
+echo "${OK_COLOR}--> Compiling Packer${NO_COLOR}"
+go build -v -o bin/packer .
+
+# Go over each plugin and build it
+for PLUGIN in $(find ./plugin -type d -mindepth 1 -maxdepth 1); do
+    PLUGIN_NAME=$(basename ${PLUGIN})
+    echo "${OK_COLOR}--> Compiling Plugin: ${PLUGIN_NAME}${NO_COLOR}"
+    go build -v -o bin/packer-${PLUGIN_NAME} ${PLUGIN}
+done
diff --git a/plugin/builder-amazon-ebs/Makefile b/plugin/builder-amazon-ebs/Makefile
deleted file mode 100644
index 729870e83..000000000
--- a/plugin/builder-amazon-ebs/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-PLUGIN_NAME=packer-builder-amazon-ebs
-
-plugin:
-	go get -d -v ./...
-	go build -v -o $(ROOTDIR)/bin/$(PLUGIN_NAME)
-
-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/Makefile b/plugin/command-build/Makefile
deleted file mode 100644
index 11b21c774..000000000
--- a/plugin/command-build/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-plugin:
-	go get -d -v ./...
-	go build -v -o $(ROOTDIR)/bin/packer-command-build
-
-format:
-	go fmt ./...
-
-test:
-	@go list -f '{{range .TestImports}}{{.}}\
-		{{end}}' ./... | xargs -n1 go get -d
-	go test ./...
-
-.PHONY: all format test