diff --git a/src/Makefile b/src/Makefile
index e568375..5fbfbbd 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -6,10 +6,11 @@ SERVER = ../bin/iodined
 
 OS = `echo $(TARGETOS) | tr "a-z" "A-Z"`
 ARCH = `uname -m`
+HEAD_COMMIT = `git rev-parse --short HEAD`
 
 LIBPATH = -L.
 LDFLAGS +=  -lz `sh osflags $(TARGETOS) link` $(LIBPATH)
-CFLAGS += -c -g -Wall -D$(OS) -pedantic `sh osflags $(TARGETOS) cflags`
+CFLAGS += -c -g -Wall -D$(OS) -pedantic `sh osflags $(TARGETOS) cflags` -DGITREVISION=\"$(HEAD_COMMIT)\"
 
 all: stateos $(CLIENT) $(SERVER)
 
diff --git a/src/iodine.c b/src/iodine.c
index acfa1b5..93d55f0 100644
--- a/src/iodine.c
+++ b/src/iodine.c
@@ -101,12 +101,9 @@ help() {
 
 static void
 version() {
-	char *svnver;
-
-	svnver = "$Rev$ from $Date$";
 
 	fprintf(stderr, "iodine IP over DNS tunneling client\n");
-	fprintf(stderr, "SVN version: %s\n", svnver);
+	fprintf(stderr, "Git version: %s\n", GITREVISION);
 
 	exit(0);
 }
diff --git a/src/iodined.c b/src/iodined.c
index e7ffcab..93d1e90 100644
--- a/src/iodined.c
+++ b/src/iodined.c
@@ -2228,10 +2228,8 @@ help() {
 
 static void
 version() {
-	char *svnver;
-	svnver = "$Rev$ from $Date$";
 	fprintf(stderr, "iodine IP over DNS tunneling server\n");
-	fprintf(stderr, "SVN version: %s\n", svnver);
+	fprintf(stderr, "Git version: %s\n", GITREVISION);
 	exit(0);
 }