diff --git a/src/game/CAvaraApp.cpp b/src/game/CAvaraApp.cpp
index ac534be1..0ba9f4a9 100755
--- a/src/game/CAvaraApp.cpp
+++ b/src/game/CAvaraApp.cpp
@@ -38,6 +38,8 @@
 #include "Debug.h"
 #include "ModernOpenGLRenderer.h"
 #include "LegacyOpenGLRenderer.h"
+#include "GitVersion.h"   // version.git
+#include "CNetManager.h"  // version.net
 
 // included while we fake things out
 #include "CPlayerManager.h"
@@ -506,7 +508,10 @@ void CAvaraAppImpl::TrackerUpdate() {
     if(trackerState["players"].empty()) {
         trackerState["players"].push_back(String(kPlayerNameTag));
     }
-    trackerState["description"] = String(kServerDescription);
+    std::string gitv = std::string(GIT_VERSION);
+    trackerState["version"]["git"] = gitv;
+    trackerState["version"]["net"] = kAvaraNetVersion;
+    trackerState["description"] = gitv.substr(0, 6) + (gitv.length() > 8 ? "\\*: " : ": ") + String(kServerDescription);
     trackerState["password"] = String(kServerPassword).length() > 0 ? true : false;
 
     DBG_Log("tracker", "%s", trackerState.dump().c_str());
diff --git a/src/game/CNetManager.cpp b/src/game/CNetManager.cpp
index 27649ec8..4b296bd7 100644
--- a/src/game/CNetManager.cpp
+++ b/src/game/CNetManager.cpp
@@ -42,13 +42,6 @@
 #define HIGHERLATENCYCOUNT  (0.25 * AUTOLATENCYPERIOD / itsGame->frameTime)       // 25% of frames
 #define DECREASELATENCYPERIOD (itsGame->TimeToFrameCount(AUTOLATENCYPERIOD*2))    // 2 consecutive votes ≈ 7.7 sec
 
-
-#if ROUTE_THRU_SERVER
-    #define kAvaraNetVersion 666
-#else
-    #define kAvaraNetVersion 13
-#endif
-
 #define kMessageBufferMaxAge 90
 #define kMessageBufferMinAge 30
 #define kMessageWaitTime 12
diff --git a/src/game/CNetManager.h b/src/game/CNetManager.h
index a653e6a2..d5165ad1 100644
--- a/src/game/CNetManager.h
+++ b/src/game/CNetManager.h
@@ -34,6 +34,9 @@
 
 #define kMaxLatencyTolerance 8
 
+#define kAvaraNetVersion 13
+
+
 enum { kNullNet, kServerNet, kClientNet };
 
 //	Server option bits