diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml
index e67143ed6..0b2fb6973 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml
@@ -61,4 +61,12 @@
 
     </dependencies>
 
+    <build>
+
+        <!-- Dist .tar.gz for guacamole-auth-jdbc should be named after the
+            parent guacamole-auth-jdbc project, not after guacamole-auth-jdbc-dist -->
+        <finalName>${project.parent.artifactId}-${project.parent.version}</finalName>
+
+    </build>
+
 </project>
diff --git a/pom.xml b/pom.xml
index b33a6db14..e384ad9cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -428,7 +428,6 @@
                                 <id>make-dist-archive</id>
                                 <phase>package</phase>
                                 <configuration>
-                                    <finalName>${project.artifactId}-${project.version}</finalName>
                                     <appendAssemblyId>false</appendAssemblyId>
                                     <tarLongFileMode>posix</tarLongFileMode>
                                     <descriptors>