Index: src/main/java/org/apache/maven/plugin/ear/output/StandardFileNameMapping.java
===================================================================
--- src/main/java/org/apache/maven/plugin/ear/output/StandardFileNameMapping.java	(revision 899976)
+++ src/main/java/org/apache/maven/plugin/ear/output/StandardFileNameMapping.java	(working copy)
@@ -33,6 +33,20 @@
 
     public String mapFileName( final Artifact a )
     {
-        return a.getFile().getName();
+        String extension = a.getArtifactHandler().getExtension();
+
+        StringBuffer buffer = new StringBuffer( 128 );
+        buffer.append( a.getArtifactId() ).append( '-' ).append( a.getBaseVersion() );
+        if ( a.hasClassifier() )
+        {
+            buffer.append( '-' ).append( a.getClassifier() );
+        }
+        if ( extension != null && extension.length() > 0 )
+        {
+            buffer.append( '.' ).append( extension );
+        }
+
+        return buffer.toString();
     }
+
 }