diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties
index e7a33d1194..c861121956 100644
--- a/config/alfresco/messages/webclient.properties
+++ b/config/alfresco/messages/webclient.properties
@@ -639,8 +639,10 @@ run_export_in_background=Run export in background
 export_error_info=If this option is selected the export will be performed in the background so the results may not appear immediately. You may also want to monitor the server console and log files for errors.
 
 # Import messages
-import_info=Imports an Alfresco content package file into the repository.
-import_package_description=Alfresco content package
+import_info=Imports an Alfresco Content Package or ZIP format file into the repository.
+import_acp_description=Alfresco content package
+import_zip_description=Archive package
+locate_acp_upload=Locate the .acp or .zip file to upload
 run_import_in_background=Run import in background
 import_error_info=If this option is selected the import will be performed in the background so the results may not appear immediately. You may also want to monitor the server console and log files for errors.
 
diff --git a/config/alfresco/web-client-config-actions.xml b/config/alfresco/web-client-config-actions.xml
index b0d671491a..279d5f497d 100644
--- a/config/alfresco/web-client-config-actions.xml
+++ b/config/alfresco/web-client-config-actions.xml
@@ -710,6 +710,7 @@
             <action idref="cut_node" />
             <action idref="copy_node" />
             <action idref="paste_all" />
+            <action idref="import_space" />
             <action idref="manage_space_users" />
             <action idref="manage_space_rules" />
             <!-- NOTE: now found on the User Console
diff --git a/source/java/org/alfresco/web/bean/ImportBean.java b/source/java/org/alfresco/web/bean/ImportBean.java
index 30752ec2a6..9e4ff89e41 100644
--- a/source/java/org/alfresco/web/bean/ImportBean.java
+++ b/source/java/org/alfresco/web/bean/ImportBean.java
@@ -41,6 +41,7 @@ import org.alfresco.service.cmr.action.ActionService;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.ContentService;
 import org.alfresco.service.cmr.repository.ContentWriter;
+import org.alfresco.service.cmr.repository.MimetypeService;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.namespace.NamespaceService;
@@ -70,6 +71,7 @@ public class ImportBean
    protected NodeService nodeService;
    protected ActionService actionService;
    protected ContentService contentService;
+   protected MimetypeService mimetypeService;
    
    private File file;
    private String fileName;
@@ -101,14 +103,14 @@ public class ImportBean
                tx = Repository.getUserTransaction(context);
                tx.begin();
                
-               // first of all we need to add the uploaded ACP file to the repository
-               NodeRef acpNodeRef = addACPToRepository(context);
+               // first of all we need to add the uploaded ACP/ZIP file to the repository
+               NodeRef acpNodeRef = addFileToRepository(context);
                
                // build the action params map based on the bean's current state
-               Map<String, Serializable> params = new HashMap<String, Serializable>(3);
+               Map<String, Serializable> params = new HashMap<String, Serializable>(2, 1.0f);
                params.put(ImporterActionExecuter.PARAM_DESTINATION_FOLDER, this.browseBean.getActionSpace().getNodeRef());
                params.put(ImporterActionExecuter.PARAM_ENCODING, this.encoding);
-                
+               
                // build the action to execute
                Action action = this.actionService.createAction(ImporterActionExecuter.NAME, params);
                action.setExecuteAsynchronously(this.runInBackground);
@@ -292,12 +294,22 @@ public class ImportBean
    }
    
    /**
-    * Adds the uploaded ACP file to the repository
+    * Sets the mimetype sevice
+    * 
+    * @param mimetypeService the mimetype service
+    */
+   public void setMimetypeService(MimetypeService mimetypeService)
+   {
+      this.mimetypeService = mimetypeService;
+   }
+   
+   /**
+    * Adds the uploaded ACP/ZIP file to the repository
     *  
     * @param context Faces context
-    * @return NodeRef representing the ACP file in the repository
+    * @return NodeRef representing the ACP/ZIP file in the repository
     */
-   private NodeRef addACPToRepository(FacesContext context)
+   private NodeRef addFileToRepository(FacesContext context)
    {
       // set the name for the new node
       Map<QName, Serializable> contentProps = new HashMap<QName, Serializable>(1);
@@ -311,19 +323,23 @@ public class ImportBean
            ContentModel.TYPE_CONTENT, contentProps);
       
       NodeRef acpNodeRef = assocRef.getChildRef();
-     
+      
       // apply the titled aspect to behave in the web client
-      Map<QName, Serializable> titledProps = new HashMap<QName, Serializable>(3, 1.0f);
+      String mimetype = this.mimetypeService.guessMimetype(this.fileName);
+      Map<QName, Serializable> titledProps = new HashMap<QName, Serializable>(2, 1.0f);
       titledProps.put(ContentModel.PROP_TITLE, this.fileName);
-      titledProps.put(ContentModel.PROP_DESCRIPTION, Application.getMessage(context, "import_package_description"));
+      titledProps.put(ContentModel.PROP_DESCRIPTION,
+            MimetypeMap.MIMETYPE_ACP.equals(mimetype) ?
+               Application.getMessage(context, "import_acp_description") :
+               Application.getMessage(context, "import_zip_description"));
       this.nodeService.addAspect(acpNodeRef, ContentModel.ASPECT_TITLED, titledProps);
-     
+      
       // add the content to the node
       ContentWriter writer = this.contentService.getWriter(acpNodeRef, ContentModel.PROP_CONTENT, true);
       writer.setEncoding(this.encoding);
-      writer.setMimetype(MimetypeMap.MIMETYPE_ACP);
+      writer.setMimetype(mimetype);
       writer.putContent(this.file);
-            
+      
       return acpNodeRef;
    }
 }
diff --git a/source/java/org/alfresco/web/bean/wcm/ImportWebsiteDialog.java b/source/java/org/alfresco/web/bean/wcm/ImportWebsiteDialog.java
index 41a2654f76..ad26142361 100644
--- a/source/java/org/alfresco/web/bean/wcm/ImportWebsiteDialog.java
+++ b/source/java/org/alfresco/web/bean/wcm/ImportWebsiteDialog.java
@@ -25,17 +25,11 @@
 package org.alfresco.web.bean.wcm;
 
 import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.text.MessageFormat;
-import java.util.Enumeration;
-import java.util.zip.ZipException;
 
 import javax.faces.context.FacesContext;
 import javax.faces.event.ActionEvent;
@@ -44,6 +38,7 @@ import javax.transaction.UserTransaction;
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ApplicationModel;
 import org.alfresco.model.ContentModel;
+import org.alfresco.repo.action.executer.ImporterActionExecuter;
 import org.alfresco.repo.avm.AVMNodeConverter;
 import org.alfresco.repo.domain.PropertyValue;
 import org.alfresco.service.ServiceRegistry;
@@ -62,7 +57,6 @@ import org.alfresco.web.app.context.UIContextService;
 import org.alfresco.web.bean.FileUploadBean;
 import org.alfresco.web.bean.repository.Repository;
 import org.alfresco.web.ui.common.Utils;
-import org.apache.tools.zip.ZipEntry;
 import org.apache.tools.zip.ZipFile;
 
 /**
@@ -306,14 +300,12 @@ public class ImportWebsiteDialog
          File tempDir = new File(alfTempDir.getPath() + File.separatorChar + file.getName() + "_unpack");
          try
          {
-            // TODO: improve this code to directly pipe the zip stream output into the repo objects - 
-            //       to remove the need to expand to the filesystem first.
-            extractFile(zipFile, tempDir.getPath());
+            ImporterActionExecuter.extractFile(zipFile, tempDir.getPath());
             importDirectory(tempDir.getPath(), rootRef);
          }
          finally
          {
-            deleteDir(tempDir);
+            ImporterActionExecuter.deleteDir(tempDir);
          }
       }
       catch (IOException e)
@@ -322,66 +314,6 @@ public class ImportWebsiteDialog
       }
    }
    
-   /**
-    * Extract the file and folder structure of a ZIP file into the specified directory
-    * 
-    * @param archive       The ZIP archive to extract
-    * @param extractDir    The directory to extract into
-    */
-   private void extractFile(ZipFile archive, String extractDir)
-   {
-      String fileName;
-      String destFileName;
-      byte[] buffer = new byte[BUFFER_SIZE];
-      extractDir = extractDir + File.separator;
-      try
-      {
-         for (Enumeration e = archive.getEntries(); e.hasMoreElements();)
-         {
-            ZipEntry entry = (ZipEntry) e.nextElement();
-            if (!entry.isDirectory())
-            {
-               fileName = entry.getName();
-               fileName = fileName.replace('/', File.separatorChar);
-               destFileName = extractDir + fileName;
-               File destFile = new File(destFileName);
-               String parent = destFile.getParent();
-               if (parent != null)
-               {
-                  File parentFile = new File(parent);
-                  if (!parentFile.exists()) parentFile.mkdirs();
-               }
-               InputStream in = new BufferedInputStream(archive.getInputStream(entry), BUFFER_SIZE);
-               OutputStream out = new BufferedOutputStream(new FileOutputStream(destFileName), BUFFER_SIZE);
-               int count;
-               while ((count = in.read(buffer)) != -1)
-               {
-                  out.write(buffer, 0, count);
-               }
-               in.close();
-               out.close();
-            }
-            else
-            {
-               File newdir = new File(extractDir + entry.getName());
-               newdir.mkdir();
-            }
-         }
-      }
-      catch (ZipException e)
-      {
-         throw new AlfrescoRuntimeException("Failed to process ZIP file.", e);
-      }
-      catch (FileNotFoundException e)
-      {
-         throw new AlfrescoRuntimeException("Failed to process ZIP file.", e);
-      }
-      catch (IOException e)
-      {
-         throw new AlfrescoRuntimeException("Failed to process ZIP file.", e);
-      }
-   }
-   
    /**
     * Recursively import a directory structure into the specified root node
     * 
@@ -464,20 +396,4 @@ public class ImportWebsiteDialog
          }
       }
    }
-   
-   /**
-    * Recursively delete a dir of files and directories
-    * 
-    * @param dir directory to delete
-    */
-   private void deleteDir(File dir)
-   {
-      File elenco = new File(dir.getPath());
-      for (File file : elenco.listFiles())
-      {
-         if (file.isFile()) file.delete();
-         else deleteDir(file);
-      }
-      dir.delete();
-   }
 }
diff --git a/source/web/WEB-INF/faces-config-beans.xml b/source/web/WEB-INF/faces-config-beans.xml
index a0f4f9c8cc..7d0453ad46 100644
--- a/source/web/WEB-INF/faces-config-beans.xml
+++ b/source/web/WEB-INF/faces-config-beans.xml
@@ -1369,6 +1369,10 @@
          <property-name>contentService</property-name>
          <value>#{ContentService}</value>
       </managed-property>
+      <managed-property>
+         <property-name>mimetypeService</property-name>
+         <value>#{MimetypeService}</value>
+      </managed-property>
    </managed-bean>
 
    <!-- Admin Node Browser Beans -->
diff --git a/source/web/WEB-INF/faces-config-navigation.xml b/source/web/WEB-INF/faces-config-navigation.xml
index 9ca9ea9ac1..57e26a4578 100644
--- a/source/web/WEB-INF/faces-config-navigation.xml
+++ b/source/web/WEB-INF/faces-config-navigation.xml
@@ -69,7 +69,10 @@
          <from-outcome>addTranslation</from-outcome>
          <to-view-id>/jsp/ml/add-translation-dialog.jsp</to-view-id>
       </navigation-case>
-      
+      <navigation-case>
+         <from-outcome>import</from-outcome>
+         <to-view-id>/jsp/dialog/import.jsp</to-view-id>
+      </navigation-case>
    </navigation-rule>
    
    <!-- rule to get to the Advanced Search page from anywhere -->
@@ -222,10 +225,6 @@
          <from-outcome>showNodeBrowser</from-outcome>
          <to-view-id>/jsp/admin/store-browser.jsp</to-view-id>
       </navigation-case>
-      <navigation-case>
-         <from-outcome>import</from-outcome>
-         <to-view-id>/jsp/dialog/import.jsp</to-view-id>
-      </navigation-case>
       <navigation-case>
          <from-outcome>export</from-outcome>
          <to-view-id>/jsp/dialog/export.jsp</to-view-id>
@@ -294,10 +293,6 @@
          <from-outcome>manageRules</from-outcome>
          <to-view-id>/jsp/dialog/rules.jsp</to-view-id>
       </navigation-case>
-      <navigation-case>
-         <from-outcome>import</from-outcome>
-         <to-view-id>/jsp/dialog/import.jsp</to-view-id>
-      </navigation-case>
       <navigation-case>
          <from-outcome>export</from-outcome>
          <to-view-id>/jsp/dialog/export.jsp</to-view-id>
@@ -834,10 +829,6 @@
          <from-outcome>manageInvitedUsers</from-outcome>
          <to-view-id>/jsp/roles/manage-invited-users.jsp</to-view-id>
       </navigation-case>
-      <navigation-case>
-         <from-outcome>import</from-outcome>
-         <to-view-id>/jsp/dialog/import.jsp</to-view-id>
-      </navigation-case>
       <navigation-case>
          <from-outcome>export</from-outcome>
          <to-view-id>/jsp/dialog/export.jsp</to-view-id>
diff --git a/source/web/jsp/dialog/import.jsp b/source/web/jsp/dialog/import.jsp
index 819d296b3e..7109491462 100644
--- a/source/web/jsp/dialog/import.jsp
+++ b/source/web/jsp/dialog/import.jsp
@@ -114,7 +114,7 @@
                               <table cellpadding="2" cellspacing="2" border="0">
                                  <tr><td class="paddingRow"></td></tr>
                                  <tr>
-                                    <td class="mainSubText">1. <h:outputText value="#{msg.locate_doc_upload}"/></td>
+                                    <td class="mainSubText">1. <h:outputText value="#{msg.locate_acp_upload}"/></td>
                                  </tr>
                                  <tr><td class="paddingRow"></td></tr>
                                  <r:uploadForm>