diff --git a/ntcore.gradle b/ntcore.gradle
index 59ed966aac..39fb71e0d3 100644
--- a/ntcore.gradle
+++ b/ntcore.gradle
@@ -61,7 +61,12 @@ def ntcoreZipTask = { project ->
         group = 'WPILib'
         destinationDir = project.buildDir
         baseName = 'ntcore'
-        classifier = "${project.buildPlatform}"
+        if (project.isArm && project.hasProperty('compilerPrefix')
+            && project.hasProperty('armSuffix')) {
+            classifier = "${project.buildPlatform}${project.armSuffix}"
+        } else {
+            classifier = "${project.buildPlatform}"
+        }
         duplicatesStrategy = 'exclude'
 
         from(file('include')) {
diff --git a/wpiutil.gradle b/wpiutil.gradle
index a2b2204441..6cd9fabc09 100644
--- a/wpiutil.gradle
+++ b/wpiutil.gradle
@@ -34,7 +34,12 @@ def wpiutilZipTask = { project ->
         group = 'WPILib'
         destinationDir = project.buildDir
         baseName = 'wpiutil'
-        classifier = "${project.buildPlatform}"
+        if (project.isArm && project.hasProperty('compilerPrefix')
+            && project.hasProperty('armSuffix')) {
+            classifier = "${project.buildPlatform}${project.armSuffix}"
+        } else {
+            classifier = "${project.buildPlatform}"
+        }
         duplicatesStrategy = 'exclude'
 
         from(file('wpiutil/include')) {