diff --git a/gen/wpilibj_frcnetcomm.py b/gen/wpilibj_frcnetcomm.py
index 664bfd1e69..b30321ce92 100755
--- a/gen/wpilibj_frcnetcomm.py
+++ b/gen/wpilibj_frcnetcomm.py
@@ -27,7 +27,7 @@ def main():
         configPath = ".."
 
     outputName = configPath + \
-        "/hal/src/main/java/edu/wpi/first/wpilibj/hal/FRCNetComm.java"
+        "/hal/src/generated/java/edu/wpi/first/wpilibj/hal/FRCNetComm.java"
 
     # Set initial copyright year and get current year
     year = "2016"
diff --git a/hal/CMakeLists.txt b/hal/CMakeLists.txt
index ed205bb1dd..0664f007d1 100644
--- a/hal/CMakeLists.txt
+++ b/hal/CMakeLists.txt
@@ -12,7 +12,9 @@ if (NOT WITHOUT_JAVA)
         hal_shared_jni_src src/main/native/cpp/jni/*.cpp
         hal_sim_jni_src src/main/native/sim/jni/*.cpp)
 
-    file(GLOB_RECURSE JAVA_SOURCES src/main/java/*.java)
+    file(GLOB_RECURSE JAVA_SOURCES
+        src/generated/java/*.java
+        src/main/java/*.java)
     set(CMAKE_JNI_TARGET true)
 
     if(${CMAKE_VERSION} VERSION_LESS "3.11.0")
diff --git a/hal/build.gradle b/hal/build.gradle
index 097dde70a7..8ec80455a2 100644
--- a/hal/build.gradle
+++ b/hal/build.gradle
@@ -89,3 +89,5 @@ model {
         }
     }
 }
+
+sourceSets.main.java.srcDir "$projectDir/src/generated/java/"
diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/hal/FRCNetComm.java b/hal/src/generated/java/edu/wpi/first/wpilibj/hal/FRCNetComm.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/wpilibj/hal/FRCNetComm.java
rename to hal/src/generated/java/edu/wpi/first/wpilibj/hal/FRCNetComm.java