diff --git a/Makefile b/Makefile
index 047a63da24..9139cf71c4 100644
--- a/Makefile
+++ b/Makefile
@@ -160,9 +160,18 @@ _build_local:
 	+@GOOS=$(GOOS) GOARCH=$(GOARCH) $(MAKE) --no-print-directory build \
 		GO_BUILD_PACKAGES:=./cmd/microshift \
 		GO_BUILD_BINDIR:=$(CROSS_BUILD_BINDIR)/$(GOOS)_$(GOARCH)
-	+@GOOS=$(GOOS) GOARCH=$(GOARCH) $(MAKE) -C etcd --no-print-directory build \
-		GO_BUILD_PACKAGES:=./cmd/microshift-etcd \
-		GO_BUILD_BINDIR:=../$(CROSS_BUILD_BINDIR)/$(GOOS)_$(GOARCH)
+	+@GOOS=$(GOOS) GOARCH=$(GOARCH) \
+		GO_LD_FLAGS="$(GC_FLAGS) -ldflags \"\
+                   -X main.majorFromGit=$(MAJOR) \
+                   -X main.minorFromGit=$(MINOR) \
+                   -X main.versionFromGit=$(EMBEDDED_GIT_TAG) \
+                   -X main.commitFromGit=$(EMBEDDED_GIT_COMMIT) \
+                   -X main.gitTreeState=$(EMBEDDED_GIT_TREE_STATE) \
+                   -X main.buildDate=$(BIN_TIMESTAMP) \
+					$(LD_FLAGS)\"" \
+		$(MAKE) -C etcd --no-print-directory build \
+			GO_BUILD_PACKAGES:=./cmd/microshift-etcd \
+			GO_BUILD_BINDIR:=../$(CROSS_BUILD_BINDIR)/$(GOOS)_$(GOARCH)
 
 cross-build-linux-amd64:
 	+$(MAKE) _build_local GOOS=linux GOARCH=amd64