diff --git a/photon-server/build.gradle b/photon-server/build.gradle
index 350ddd2a3..d2d7356df 100644
--- a/photon-server/build.gradle
+++ b/photon-server/build.gradle
@@ -11,7 +11,7 @@ apply from: 'versioningHelper.gradle'
 mainClassName = 'org.photonvision.Main'
 
 group 'org.photonvision'
-version getCurrentVersion()
+version versionString
 
 sourceCompatibility = 11
 
diff --git a/photon-server/src/main/java/org/photonvision/Main.java b/photon-server/src/main/java/org/photonvision/Main.java
index 72bc20810..a0d426a3b 100644
--- a/photon-server/src/main/java/org/photonvision/Main.java
+++ b/photon-server/src/main/java/org/photonvision/Main.java
@@ -39,10 +39,6 @@ public class Main {
     private static final Logger logger = new Logger(Main.class, LogGroup.General);
     public static final int DEFAULT_WEBPORT = 5800;
 
-    private static String getVersion() {
-        return "2020.7.1"; // TODO: grab from gradle/resource somehow
-    }
-
     public static void main(String[] args) {
         Logger.setLevel(LogGroup.Camera, LogLevel.TRACE);
         Logger.setLevel(LogGroup.WebServer, LogLevel.TRACE);
@@ -54,7 +50,7 @@ public class Main {
 
         logger.info(
                 "Starting PhotonVision version "
-                        + getVersion()
+                        + PhotonVersion.versionString
                         + " on "
                         + Platform.CurrentPlatform.toString());
         try {
diff --git a/photon-server/versioningHelper.gradle b/photon-server/versioningHelper.gradle
index 84ebba410..5d8cd7d49 100644
--- a/photon-server/versioningHelper.gradle
+++ b/photon-server/versioningHelper.gradle
@@ -1,3 +1,6 @@
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
+
 gradle.allprojects {
     ext.getCurrentVersion = { ->
         def stdout = new ByteArrayOutputStream()
@@ -5,11 +8,15 @@ gradle.allprojects {
             commandLine 'git', 'describe', '--tags'
             standardOutput = stdout
         }
-        return stdout.toString().trim().toLowerCase()
+        String tagIsh = stdout.toString().trim().toLowerCase()
+        println("Picked up version: " + tagIsh)
+        return tagIsh
     }
+    ext.versionString = getCurrentVersion()
 }
 
 task writeCurrentVersionJava {
+    String date = DateTimeFormatter.ofPattern("yyyy-M-d hh:mm:ss").format(LocalDateTime.now())
     File versionFile = new File("src/main/java/org/photonvision/PhotonVersion.java")
     versionFile.delete()
     versionFile << "package org.photonvision;\n" +
@@ -17,9 +24,13 @@ task writeCurrentVersionJava {
             "/*\n" +
             " * Autogenerated file! Do not manually edit this file. This version is regenerated\n" +
             " * any time the publish task is run, or when this file is deleted.\n" +
-            " */\n\n" +
-            "public class PhotonVersion {\n" +
-            String.format("    public static final String versionString = \"%s\";\n", getCurrentVersion()) +
+            " */\n" +
+            "\n" +
+            "@SuppressWarnings(\"ALL\")\n" +
+            "public final class PhotonVersion {\n" +
+            "    public static final String versionString = \"${versionString}\";\n" +
+            "    public static final String buildDate = \"${date}\";\n" +
+            "    public static final boolean isRelease = versionString.startsWith(\"dev\");\n" +
             "}"
 }