diff --git a/NXDNGateway/Makefile b/NXDNGateway/Makefile
index c989240..87f9b2a 100644
--- a/NXDNGateway/Makefile
+++ b/NXDNGateway/Makefile
@@ -16,15 +16,30 @@ OBJECTS = APRSWriter.o Conf.o GPSHandler.o IcomNetwork.o KenwoodNetwork.o Log.o
 
 all:		NXDNGateway
 
-NXDNGateway:	$(OBJECTS)
+NXDNGateway:	GitVersion.h $(OBJECTS)
 		$(CXX) $(OBJECTS) $(CFLAGS) $(LIBS) -o NXDNGateway
 
 %.o: %.cpp
 		$(CXX) $(CFLAGS) -c -o $@ $<
 
+NXDNGateway.o: GitVersion.h FORCE
+
+.PHONY: GitVersion.h
+
+FORCE:
+
+
 install:
 		install -m 755 NXDNGateway /usr/local/bin/
 
 clean:
 		$(RM) NXDNGateway *.o *.d *.bak *~
- 
+
+# Export the current git version if the index file exists, else 000...
+GitVersion.h:
+ifneq ("$(wildcard ../.git/index)","")
+	echo "const char *gitversion = \"$(shell git rev-parse HEAD)\";" > $@
+else
+	echo "const char *gitversion = \"0000000000000000000000000000000000000000\";" > $@
+endif
+
diff --git a/NXDNParrot/Makefile b/NXDNParrot/Makefile
index e82bca0..7b8012b 100644
--- a/NXDNParrot/Makefile
+++ b/NXDNParrot/Makefile
@@ -8,14 +8,30 @@ OBJECTS = NXDNNetwork.o NXDNParrot.o Parrot.o StopWatch.o Thread.o Timer.o UDPSo
 
 all:		NXDNParrot
 
-NXDNParrot:	$(OBJECTS)
+NXDNParrot:	GitVersion.h $(OBJECTS)
 		$(CXX) $(OBJECTS) $(CFLAGS) $(LIBS) -o NXDNParrot
 
 %.o: %.cpp
 		$(CXX) $(CFLAGS) -c -o $@ $<
 
+NXDNParrot.o: GitVersion.h FORCE
+
+.PHONY: GitVersion.h
+
+FORCE:
+
+
 install:
 		install -m 755 NXDNParrot /usr/local/bin/
 
 clean:
 		$(RM) NXDNParrot *.o *.d *.bak *~
+		
+# Export the current git version if the index file exists, else 000...
+GitVersion.h:
+ifneq ("$(wildcard ../.git/index)","")
+	echo "const char *gitversion = \"$(shell git rev-parse HEAD)\";" > $@
+else
+	echo "const char *gitversion = \"0000000000000000000000000000000000000000\";" > $@
+endif
+