diff --git a/Makefile b/Makefile
index b1aa0bc..084c57b 100644
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,8 @@ ifeq ($(DEB_ARCH),386)
 endif
 DEBFILE ?= snclient-$(VERSION)-$(RPM_ARCH).deb
 
-BUILD_FLAGS=-ldflags "-s -w -X pkg/snclient.Build=$(BUILD) -X pkg/snclient.Revision=$(REVISION)"
+GITBASE=github.com/consol-monitoring/snclient
+BUILD_FLAGS=-ldflags "-s -w -X $(GITBASE)/pkg/snclient.Build=$(BUILD) -X $(GITBASE)/pkg/snclient.Revision=$(REVISION)"
 TEST_FLAGS=-timeout=5m $(BUILD_FLAGS)
 
 NODE_EXPORTER_VERSION=1.8.1
@@ -602,7 +603,7 @@ release_blog_text: release_notes.txt
 	@echo ''
 	@echo '### Download'
 	@echo ''
-	@echo '<https://github.com/ConSol-Monitoring/snclient/releases/tag/v$(VERSION)>'
+	@echo '<https://$(GITBASE)/releases/tag/v$(VERSION)>'
 
 
 # just skip unknown make targets
diff --git a/pkg/snclient/snclient.go b/pkg/snclient/snclient.go
index 6d7aa7f..581d60c 100644
--- a/pkg/snclient/snclient.go
+++ b/pkg/snclient/snclient.go
@@ -67,11 +67,11 @@ const (
 
 var (
 	// Build contains the current git commit id
-	// compile passing -ldflags "-X pkg/snclient.Build <build sha1>" to set the id.
+	// compile passing -ldflags "-X snclient.Build <build sha1>" to set the id.
 	Build = ""
 
 	// Revision contains the minor version number (number of commits, since last tag)
-	// compile passing -ldflags "-X pkg/snclient.Revision <commits>" to set the revision number.
+	// compile passing -ldflags "-X snclient.Revision <commits>" to set the revision number.
 	Revision = ""
 )