diff --git a/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/AbstractAmpMojo.java b/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/AbstractAmpMojo.java
index ad27af1b..efe17628 100644
--- a/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/AbstractAmpMojo.java
+++ b/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/AbstractAmpMojo.java
@@ -53,7 +53,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
-public abstract class AbstractAmpMojo extends AbstractMojo
+public abstract class   AbstractAmpMojo extends AbstractMojo
 {
 
     /**
@@ -392,12 +392,12 @@ public abstract class AbstractAmpMojo extends AbstractMojo
      *
      * @parameter alias="includes"
      */
-    private String mAmpJarIncludes = "**";
+    private String mAmpJarIncludes = "**/*.class,META-INF/**";
 
     /**
-     * The comma separated list of tokens to exclude from the AMP created JAR file. By default module configuration is left outside jars.
+     * The comma separated list of tokens to exclude from the AMP created JAR file
      *
-     * @parameter alias="excludes" default-value="alfresco/module/**"
+     * @parameter alias="excludes" default-value=""
      */
     private String mAmpJarExcludes;
     
diff --git a/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/AmpMojo.java b/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/AmpMojo.java
index 10ec1fd1..9eba6dc5 100644
--- a/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/AmpMojo.java
+++ b/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/AmpMojo.java
@@ -277,7 +277,7 @@ public class AmpMojo extends AbstractAmpMojo
         vArchiver.setOutputFile(pAmpFile);
 
         /* setup amp Archiver */
-        this.getAmpArchiver().addDirectory(this.getAmpDirectory(), this.getIncludes(), this.getExcludes());
+        this.getAmpArchiver().addDirectory(this.getAmpDirectory(), null, null);
 
         // create archive
         vArchiver.createArchive(this.getProject(), archive );
diff --git a/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/packaging/AmpProjectPackagingTask.java b/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/packaging/AmpProjectPackagingTask.java
index c94b7984..2246cfb1 100644
--- a/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/packaging/AmpProjectPackagingTask.java
+++ b/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/packaging/AmpProjectPackagingTask.java
@@ -213,7 +213,7 @@ public class AmpProjectPackagingTask
             {
                 final PathSet sources = getFilesToIncludes( context.getAmpConfigDirectory(),
                                                             new String[0],
-                                                            new String[] {"**/*.class"} );
+                                                            new String[] {"**/*.class","META-INF/**"} );
 
                 try
                 {