diff --git a/shared/jni/publish.gradle b/shared/jni/publish.gradle
index 42f0a951bc..a33ca82686 100644
--- a/shared/jni/publish.gradle
+++ b/shared/jni/publish.gradle
@@ -6,6 +6,7 @@ def outputsFolder = file("$buildDir/outputs")
 def baseArtifactId = nativeName
 def artifactGroupId = "edu.wpi.first.${nativeName}"
 def zipBaseName = "_GROUP_edu_wpi_first_${nativeName}_ID_${nativeName}-cpp_CLS"
+ext.zipBaseName = zipBaseName
 def jniBaseName = "_GROUP_edu_wpi_first_${nativeName}_ID_${nativeName}-jni_CLS"
 def jniCvStaticBaseName = "_GROUP_edu_wpi_first_${nativeName}_ID_${nativeName}-jnicvstatic_CLS"
 
diff --git a/wpimath/build.gradle b/wpimath/build.gradle
index 9e7c3a8d08..1c16f70cb6 100644
--- a/wpimath/build.gradle
+++ b/wpimath/build.gradle
@@ -125,3 +125,25 @@ task generateNat() {
 sourceSets.main.java.srcDir "${buildDir}/generated/java"
 compileJava.dependsOn generateNumbers
 compileJava.dependsOn generateNat
+
+task unitsHeaders(type: Zip) {
+    destinationDirectory = file("$buildDir/outputs")
+    archiveBaseName = zipBaseName
+    archiveClassifier = "units"
+
+    from(licenseFile) {
+        into '/'
+    }
+
+    ext.includeDirs = [
+        project.file('src/main/native/include/units')
+    ]
+
+    ext.includeDirs.each {
+        from(it) {
+            into '/units'
+        }
+    }
+}
+
+addTaskToCopyAllOutputs(unitsHeaders)