Index: ShadeMojo.java
===================================================================
--- ShadeMojo.java	(revision 908064)
+++ ShadeMojo.java	(working copy)
@@ -364,7 +364,24 @@
 
             getLog().info( "Including " + artifact.getId() + " in the shaded jar." );
 
-            artifacts.add( artifact.getFile() );
+            try
+            {
+                if (artifact.getFile().getCanonicalPath().endsWith("classes"))
+                {
+                    artifacts.add(
+                        new File(
+                            artifact.getFile().getCanonicalPath()
+                                .replace("classes", artifact.getArtifactId() + "-" + artifact.getBaseVersion() + ".jar")));
+                }
+                else
+                {
+                    artifacts.add( artifact.getFile() );
+                }
+            }
+            catch(final IOException e)
+            {
+                throw new MojoExecutionException( "Error creating shaded jar: " + e.getMessage(), e );
+            }
 
             artifactIds.add( getId( artifact ) );