diff --git a/agent/Makefile.in b/agent/Makefile.in
index cee6f34..1eb602a 100644
--- a/agent/Makefile.in
+++ b/agent/Makefile.in
@@ -218,6 +218,14 @@
 ##        common
 ##
 ##
+
+# A hack to force a re-build of common/main.cc everytime.
+# This is needed to bake in the git VCS information in the openolt binary
+# at the time of building the openolt package.
+common/main.o: .FORCE
+.FORCE:
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -I./common -c  common/main.cc -o common/main.o
+
 common/%.o: common/%.cc
 	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -I./common -c $< -o $@
 
@@ -321,4 +329,4 @@
 distclean: clean-src clean
 	@rm -rf $(BUILD_DIR)
 
-.PHONY: onl sdk bal protos prereq sim
+.PHONY: onl sdk bal protos prereq sim .FORCE