diff --git a/.pkgignore b/.pkgignore
new file mode 100644
index 000000000..5835ffdc3
--- /dev/null
+++ b/.pkgignore
@@ -0,0 +1,24 @@
+*.go
+*.md
+*.sh
+*.shlib
+*-stamp
+prometheus
+Makefile*
+tools
+utility
+stats
+documentation
+config
+build/*-stamp
+build/dirty
+build/cache
+build/root
+build/package/Makefile
+model
+.*
+coding
+retrieval
+web
+rules
+storage
diff --git a/Makefile b/Makefile
index a5c74be0c..590eb0f91 100644
--- a/Makefile
+++ b/Makefile
@@ -25,9 +25,11 @@ advice:
 	$(GO) tool vet .
 
 binary: build
-	$(GO) build -o prometheus $(BUILDFLAGS) .
 
 build: config dependencies model preparation tools web
+	$(GO) build -o prometheus $(BUILDFLAGS) .
+	cp prometheus build/package/prometheus
+	rsync -av build/root/lib/ build/package/lib/
 
 build/cache/$(GOPKG):
 	curl -o $@ http://go.googlecode.com/files/$(GOPKG)
@@ -56,10 +58,6 @@ format:
 model: dependencies preparation
 	$(MAKE) -C model
 
-package: binary
-	cp prometheus build/package/prometheus
-	rsync -av build/root/lib/ build/package/lib/
-
 preparation: $(GOCC) source_path
 	$(MAKE) -C build