diff --git a/Makefile b/Makefile
index 7f3b67e..b67d033 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: test all build clean test test-system test-unit
+.PHONY: test all build clean test test-system test-unit update_version
 
 PROTOFILES=$(shell find . -name \*.proto)
 PBGOFILES=$(patsubst %.proto,%.pb.go,$(PROTOFILES))
@@ -16,10 +16,16 @@ BUILD_VERSION=dev-$(BUILD_DATE)-$(BUILD_REV)
 
 all: build test
 
+update_version:
+	@sed -i'' 's/buildVersion = ".*"/buildVersion = "$(BUILD_VERSION)"/' cmd/version.go
+
+revert_version:
+	@sed -i'' 's/buildVersion = ".*"/buildVersion = ""/' cmd/version.go
+
 imposm3: $(GOFILES) $(PROTOFILES)
-	@sed -i='' 's/buildVersion = ".*"/buildVersion = "$(BUILD_VERSION)"/' cmd/version.go
+	$(MAKE) update_version
 	go build $(GOLDFLAGS)
-	@sed -i='' 's/buildVersion = ".*"/buildVersion = ""/' cmd/version.go
+	$(MAKE) revert_version
 
 build: imposm3
 
diff --git a/cmd/version.go b/cmd/version.go
index 45ef677..a4041e9 100644
--- a/cmd/version.go
+++ b/cmd/version.go
@@ -3,8 +3,8 @@ package cmd
 var Version string
 
 func init() {
-	// buidVersion gets replaced during build
-	var BuildVersion = ""
+	// buidVersion gets replaced during build with make
+	var buildVersion = ""
 	Version = "0.1"
-	Version += BuildVersion
+	Version += buildVersion
 }