diff --git a/plugins/maven-amp-plugin/pom.xml b/plugins/maven-amp-plugin/pom.xml
index b64119d5..fe90f5c3 100644
--- a/plugins/maven-amp-plugin/pom.xml
+++ b/plugins/maven-amp-plugin/pom.xml
@@ -19,7 +19,7 @@
 	</description>
 	<url>${site.url}</url>
 	<prerequisites>
-		<maven>2.0.9</maven>
+		<maven>2.0.8</maven>
 	</prerequisites>
 	<issueManagement>
 		<system>GForge</system>
@@ -71,20 +71,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-changes-plugin</artifactId>
-				<executions>
-					<execution>
-						<goals>
-							<goal>announcement-generate</goal>
-						</goals>
-						<id>announcement-generate</id>
-					</execution>
-					<execution>
-						<goals>
-							<goal>announcement-mail</goal>
-						</goals>
-						<id>announcement-mail</id>
-					</execution>
-				</executions>
 				<!--  Automatically notifies the list when release is done. Please supply username and password in the command line -->
 				<configuration>
 					<smtpHost>mail.sourcesense.com</smtpHost>
diff --git a/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/packaging/ClassesPackagingTask.java b/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/packaging/ClassesPackagingTask.java
index b4315572..24ca863c 100644
--- a/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/packaging/ClassesPackagingTask.java
+++ b/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/packaging/ClassesPackagingTask.java
@@ -7,8 +7,6 @@ import org.alfresco.maven.plugin.amp.Overlay;
 import org.codehaus.plexus.archiver.ArchiverException;
 import org.codehaus.plexus.archiver.jar.ManifestException;
 
-import sun.util.logging.resources.logging;
-
 import java.io.File;
 import java.io.IOException;
 
diff --git a/plugins/maven-amp-plugin/src/main/java/org/alfresco/plexus/archiver/AmpUnArchiver.java b/plugins/maven-amp-plugin/src/main/java/org/alfresco/plexus/archiver/AmpUnArchiver.java
index 3c01c2ac..f4babac4 100644
--- a/plugins/maven-amp-plugin/src/main/java/org/alfresco/plexus/archiver/AmpUnArchiver.java
+++ b/plugins/maven-amp-plugin/src/main/java/org/alfresco/plexus/archiver/AmpUnArchiver.java
@@ -35,6 +35,7 @@ public class AmpUnArchiver extends AbstractZipUnArchiver {
 
 	private static String fileSeparator = System.getProperty("file.separator");
 	
+	
 	public void setArchiveFilters( List filters )
 	{
 		filterSupport = new FilterSupport( filters, getLogger() );
@@ -126,7 +127,7 @@ public class AmpUnArchiver extends AbstractZipUnArchiver {
 
 
 	private String getAmpMapping(String name) {
-		if(name.startsWith("web"+ fileSeparator) && !name.startsWith("web"+ fileSeparator +"licenses"))
+		if(name.startsWith("web/") && !name.startsWith("web/licenses"))
 		{
 			return name.substring(4);
 		}
@@ -136,7 +137,7 @@ public class AmpUnArchiver extends AbstractZipUnArchiver {
 			{
 				String relativePath = "";
 				
-				if((name.startsWith("config"+fileSeparator)))
+				if((name.startsWith("config/")))
 				{
 					relativePath = name.substring(7);
 				}
@@ -186,8 +187,12 @@ public class AmpUnArchiver extends AbstractZipUnArchiver {
 			Date entryDate, boolean isDirectory )
 	throws IOException
 	{
-		File f = FileUtils.resolveFile( dir, entryName );
-
+		File f = null;
+		if (entryName != null && !"".equals(entryName))
+			f = FileUtils.resolveFile( dir, entryName );
+		else
+			return;
+		
 		try
 		{
 			if ( !isOverwrite() && f.exists() && f.lastModified() >= entryDate.getTime() )