Index: src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
===================================================================
--- src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java	(revision 383010)
+++ src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java	(working copy)
@@ -714,16 +714,8 @@
         {
             return;
         }
-
-        File javadocDirectory = getReportOutputDirectory();
-
-        if ( !javadocDirectory.getAbsolutePath().equals( getOutputDirectory() ) )
-        {
-            // we're in site-embedded report mode, so Doxia has set the
-            // reportOutputDirectory to the basedir of the site.
-            // Append 'apidocs'.
-            javadocDirectory = new File( javadocDirectory, "apidocs" );
-        }
+                
+        File javadocDirectory = new File( getOutputDirectory() );
         javadocDirectory.mkdirs();
 
         File file = new File( javadocDirectory, "files" );
Index: src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java
===================================================================
--- src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java	(revision 383010)
+++ src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java	(working copy)
@@ -41,7 +41,7 @@
      * Specifies the destination directory where javadoc saves the generated HTML files.
      * See <a href="http://java.sun.com/j2se/1.4.2/docs/tooldocs/windows/javadoc.html#d">d</a>.
      *
-     * @parameter expression="${destDir}" alias="destDir" default-value="${project.build.directory}/site/apidocs"
+     * @parameter expression="${destDir}" default-value="${project.build.directory}/site/apidocs"
      * @required
      */
     private File destDir;
@@ -49,7 +49,7 @@
     /**
      * @parameter expression="${project.build.directory}"
      */
-    private String outputDirectory;
+    private String jarOutputDirectory;
 
     /**
      * @parameter expression="${project.build.finalName}"
@@ -119,7 +119,7 @@
             throw new MojoExecutionException( "javadoc files not found." );
         }
 
-        File javadocJar = new File( outputDirectory, target );
+        File javadocJar = new File( jarOutputDirectory, target );
 
         if ( javadocJar.exists() )
         {