diff --git a/.gitignore b/.gitignore
index d283e6f162..748aea229b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,7 @@ core
 
 *-stamp
 prometheus
+benchmark.txt
 
 .#*
 command-line-arguments.test
diff --git a/Makefile b/Makefile
index 6ab81874a0..930add4ee1 100644
--- a/Makefile
+++ b/Makefile
@@ -49,8 +49,8 @@ tag:
 $(BUILD_PATH)/cache/$(GOPKG):
 	$(CURL) -o $@ -L $(GOURL)/$(GOPKG)
 
-benchmark: test
-	$(GO) test $(GO_TEST_FLAGS) -test.bench='Benchmark' ./...
+benchmark: config dependencies tools
+	$(GO) test $(GO_TEST_FLAGS) -test.run='NONE' -test.bench='.*' -test.benchmem ./... | tee benchmark.txt
 
 clean:
 	$(MAKE) -C $(BUILD_PATH) clean
diff --git a/Makefile.INCLUDE b/Makefile.INCLUDE
index b00524a95e..c936746f69 100644
--- a/Makefile.INCLUDE
+++ b/Makefile.INCLUDE
@@ -26,7 +26,7 @@ MAC_OS_X_VERSION ?= 10.8
 
 BUILD_PATH = $(PWD)/.build
 
-GO_VERSION	 := 1.3.3
+GO_VERSION	 := 1.4
 GOOS		  = $(subst Darwin,darwin,$(subst Linux,linux,$(OS)))
 
 ifeq ($(GOOS),darwin)