2 files changed, 5 insertions, 4 deletions

diff --git a/aspectjrt/aspectjrt-sources-assembly.xml b/aspectjrt/aspectjrt-sources-assembly.xml
index b4c13e2a9..fc030c3c2 100644
--- a/aspectjrt/aspectjrt-sources-assembly.xml
+++ b/aspectjrt/aspectjrt-sources-assembly.xml
@@ -2,7 +2,8 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
 
-<id>aspectjrt-sources</id>
+	<!-- Do not change this ID. It becomes the artifact classifier with appendAssemblyId=true. -->
+	<id>sources</id>
 
 	<formats>
 		<format>jar</format>
diff --git a/aspectjrt/pom.xml b/aspectjrt/pom.xml
index 341b83fd6..930ba02ca 100644
--- a/aspectjrt/pom.xml
+++ b/aspectjrt/pom.xml
@@ -99,14 +99,14 @@
 					</execution>
 
 					<execution>
-						<id>aspectjrt-src-assembly</id>
+						<id>aspectjrt-sources-assembly</id>
 						<phase>package</phase>
 						<goals>
 							<goal>single</goal>
 						</goals>
 						<configuration>
-							<classifier>sources</classifier>
-							<finalName>aspectjrt-${project.version}</finalName>
+							<!-- The assembly ID 'sources' becomes the artifact classifier, exactly what we want -->
+							<appendAssemblyId>true</appendAssemblyId>
 							<archive>
 							</archive>
 							<descriptors>