diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties
index 637dcf81b0..679edbafb0 100644
--- a/config/alfresco/messages/webclient.properties
+++ b/config/alfresco/messages/webclient.properties
@@ -782,6 +782,15 @@ space_type_note=Note: If you can only see one type of space then other space typ
 template_space=Template Space
 select_template=Select the template you want to use.
 
+# Create Website Wizard messages
+create_website=Create Website
+create_website_title=Create Website Wizard
+create_website_desc=This wizard helps you create a new website space.
+website_details=Website Details
+create_website_step1_title=Step One - Website Details
+create_website_step1_desc=Enter the information about the website.
+create_website_finish_instruction=To close this wizard and create your website space click Finish. To review or change your selections click Back.
+
 # New User Wizard messages
 new_user_title=New User Wizard
 new_user_title_edit=Edit User Wizard
diff --git a/config/alfresco/web-client-config-actions.xml b/config/alfresco/web-client-config-actions.xml
index 4a2eb195db..b13d45c252 100644
--- a/config/alfresco/web-client-config-actions.xml
+++ b/config/alfresco/web-client-config-actions.xml
@@ -354,6 +354,17 @@
             <action>wizard:createSpace</action>
          </action>
          
+         <!-- Create Website Wizard -->
+         <action id="create_website_wizard">
+            <permissions>
+               <permission allow="true">CreateChildren</permission>
+            </permissions>
+            <!-- TODO: check for role and in Websites folder --> 
+            <label-id>create_website</label-id>
+            <image>/images/icons/create_website.gif</image>
+            <action>wizard:createWebsite</action>
+         </action>
+         
          <!-- Manage Space Users -->
          <action id="manage_space_users">
             <permissions>
@@ -571,6 +582,7 @@
          <action-group id="browse_create_menu">
             <action idref="create_content" />
             <action idref="create_xml_content_type" />
+            <action idref="create_website_wizard" />
             <action idref="create_space" />
             <action idref="create_space_wizard" />
          </action-group>
diff --git a/config/alfresco/web-client-config-wizards.xml b/config/alfresco/web-client-config-wizards.xml
index 995a4cf39a..5cb58cde31 100644
--- a/config/alfresco/web-client-config-wizards.xml
+++ b/config/alfresco/web-client-config-wizards.xml
@@ -5,6 +5,24 @@
       
       <wizards>
       	
+      	<!-- Definition of a create website wizard -->
+      	<wizard name="createWebsite" managed-bean="CreateWebsiteWizard"
+                 title-id="create_website_title" description-id="create_website_desc"
+                 icon="/images/icons/create_website_large.gif">
+            <step name="details" title-id="website_details" description-id="create_website_step1_desc">
+               <page path="/jsp/wcm/create-website-wizard/details.jsp"
+                     title-id="create_website_step1_title"
+                     description-id="create_website_step1_desc"
+                     instruction-id="default_instruction" />
+            </step>
+            <step name="summary" title-id="summary" description-id="summary_step_description">
+               <page path="/jsp/wizard/summary.jsp"
+                     title-id="summary"
+                     description-id="summary_desc"
+                     instruction-id="create_website_finish_instruction" />
+            </step>
+         </wizard>
+         
       	<!-- Definition of an advanced space wizard  -->
          <wizard name="createSpace" managed-bean="CreateSpaceWizard"
                  title-id="create_space_title" description-id="create_space_desc"
diff --git a/source/java/org/alfresco/web/app/Application.java b/source/java/org/alfresco/web/app/Application.java
index 969f935d56..c4132a36ab 100644
--- a/source/java/org/alfresco/web/app/Application.java
+++ b/source/java/org/alfresco/web/app/Application.java
@@ -75,6 +75,7 @@ public class Application
    private static String savedSearchesFolderName;
    private static String scriptsFolderName;
    private static String guestHomeFolderName;
+   private static String websitesFolderName;
    
    /**
     * Private constructor to prevent instantiation of this class 
@@ -441,6 +442,22 @@ public class Application
       return getGuestHomeFolderName(FacesContextUtils.getRequiredWebApplicationContext(context));
    }
    
+   /**
+    * @return the Websites folder name
+    */
+   public static String getWebsitesFolderName(ServletContext context)
+   {
+      return getWebsitesFolderName(WebApplicationContextUtils.getRequiredWebApplicationContext(context));
+   }
+   
+   /**
+    * @return the Websites folder name
+    */
+   public static String getWebsitesFolderName(FacesContext context)
+   {
+      return getWebsitesFolderName(FacesContextUtils.getRequiredWebApplicationContext(context));
+   }
+   
    /**
     * Set the language locale for the current user context
     * 
@@ -827,7 +844,7 @@ public class Application
    }
    
    /**
-    * Returns the Guest Home folder name name
+    * Returns the Guest Home folder name
     * 
     * @param context The spring context
     * @return The Guest Home folder name
@@ -844,10 +861,28 @@ public class Application
       return guestHomeFolderName;
    }
    
+   /**
+    * Returns the Websites folder name
+    * 
+    * @param context The Spring context
+    * @return The Websites folder name
+    */
+   private static String getWebsitesFolderName(WebApplicationContext context)
+   {
+      if (websitesFolderName == null)
+      {
+         ImporterBootstrap bootstrap = (ImporterBootstrap)context.getBean(BEAN_IMPORTER_BOOTSTRAP);
+         Properties configuration = bootstrap.getConfiguration();
+         websitesFolderName = configuration.getProperty("spaces.wcm.childname");
+      }
+      
+      return websitesFolderName;
+   }
+   
    /**
     * Retrieves the configured error page for the application
     * 
-    * @param context The Spring contexr
+    * @param context The Spring context
     * @return The configured error page or null if the configuration is missing
     */
    private static String getErrorPage(WebApplicationContext context)
diff --git a/source/java/org/alfresco/web/bean/BrowseBean.java b/source/java/org/alfresco/web/bean/BrowseBean.java
index 12e283bc33..b163b6b20f 100644
--- a/source/java/org/alfresco/web/bean/BrowseBean.java
+++ b/source/java/org/alfresco/web/bean/BrowseBean.java
@@ -1560,7 +1560,7 @@ public class BrowseBean implements IContextListener
    /**
     * Perform navigation to the browse screen if it is not already the current View
     */
-   private void navigateBrowseScreen()
+   public void navigateBrowseScreen()
    {
       String outcome = null;
       
diff --git a/source/java/org/alfresco/web/bean/content/BaseContentWizard.java b/source/java/org/alfresco/web/bean/content/BaseContentWizard.java
index 1c1ff1d8e8..94c8b33970 100644
--- a/source/java/org/alfresco/web/bean/content/BaseContentWizard.java
+++ b/source/java/org/alfresco/web/bean/content/BaseContentWizard.java
@@ -334,12 +334,12 @@ public abstract class BaseContentWizard extends BaseWizardBean
    protected void saveContent(File fileContent, String strContent) throws Exception
    {
       // get the node ref of the node that will contain the content
-      NodeRef containerNodeRef = this.getContainerNodeRef();
+      NodeRef containerNodeRef = getContainerNodeRef();
       
-      FileInfo fileInfo = 
-	  this.fileFolderService.create(containerNodeRef,
-					this.fileName,
-					Repository.resolveToQName(this.objectType));
+      FileInfo fileInfo = this.fileFolderService.create(
+            containerNodeRef,
+            this.fileName,
+            Repository.resolveToQName(this.objectType));
       NodeRef fileNodeRef = fileInfo.getNodeRef();
       
       // set the author aspect
diff --git a/source/java/org/alfresco/web/bean/dialog/BaseDialogBean.java b/source/java/org/alfresco/web/bean/dialog/BaseDialogBean.java
index 535506eb18..8980e92616 100644
--- a/source/java/org/alfresco/web/bean/dialog/BaseDialogBean.java
+++ b/source/java/org/alfresco/web/bean/dialog/BaseDialogBean.java
@@ -278,13 +278,12 @@ public abstract class BaseDialogBean implements IDialogBean
             FacesContext.getCurrentInstance(), getErrorMessageId()), 
             exception.getMessage());
    }
-
-    protected NodeRef getContainerNodeRef()
-    {
+   
+   protected NodeRef getContainerNodeRef()
+   {
       String nodeId = this.navigator.getCurrentNodeId();
       return (nodeId == null
-	      ? this.nodeService.getRootNode(Repository.getStoreRef())
-	      :  new NodeRef(Repository.getStoreRef(), nodeId));
-    }
-
+              ? this.nodeService.getRootNode(Repository.getStoreRef())
+              :  new NodeRef(Repository.getStoreRef(), nodeId));
+   }
 }
diff --git a/source/java/org/alfresco/web/templating/OutputUtil.java b/source/java/org/alfresco/web/templating/OutputUtil.java
index ce58b6f4b7..f656675ab5 100644
--- a/source/java/org/alfresco/web/templating/OutputUtil.java
+++ b/source/java/org/alfresco/web/templating/OutputUtil.java
@@ -16,41 +16,24 @@
  */
 package org.alfresco.web.templating;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.ResourceBundle;
-
-import javax.faces.context.FacesContext;
-import javax.faces.event.ValueChangeEvent;
-import javax.faces.model.SelectItem;
-
-import org.alfresco.config.Config;
-import org.alfresco.config.ConfigElement;
-import org.alfresco.config.ConfigService;
-import org.alfresco.repo.content.MimetypeMap;
-import org.alfresco.web.app.AlfrescoNavigationHandler;
-import org.alfresco.web.app.Application;
-import org.alfresco.web.bean.repository.Node;
-import org.alfresco.web.data.IDataContainer;
-import org.alfresco.web.data.QuickSort;
-import org.alfresco.web.templating.*;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.io.OutputStreamWriter;
 
 import org.alfresco.model.ContentModel;
-import org.alfresco.service.cmr.avm.*;
-import org.alfresco.service.cmr.model.FileInfo;
-import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.service.cmr.repository.ContentReader;
-import org.alfresco.service.cmr.repository.ContentWriter;
-import java.io.OutputStreamWriter;
-import org.alfresco.web.app.servlet.FacesHelper;
+import org.alfresco.repo.avm.AVMContext;
+import org.alfresco.service.cmr.avm.AVMExistsException;
+import org.alfresco.service.cmr.avm.AVMNotFoundException;
+import org.alfresco.service.cmr.avm.AVMService;
 import org.alfresco.service.cmr.model.FileFolderService;
-import org.alfresco.service.cmr.repository.*;
+import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.ContentReader;
+import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.repository.ContentWriter;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.w3c.dom.Document;
-import org.alfresco.repo.avm.*;
 
 /**
  * temporary home of generate and regenerate functionality until i figure
diff --git a/source/web/WEB-INF/faces-config-beans.xml b/source/web/WEB-INF/faces-config-beans.xml
index 1e77863c63..67c90a40f8 100644
--- a/source/web/WEB-INF/faces-config-beans.xml
+++ b/source/web/WEB-INF/faces-config-beans.xml
@@ -504,9 +504,10 @@
          <value>#{DictionaryService}</value>
       </managed-property>
    </managed-bean>
+   
    <managed-bean>
       <description>
-         The bean that backs up the Create Content Wizard
+         The bean that backs up the Create XML Content Type Wizard
       </description>
       <managed-bean-name>CreateXmlContentTypeWizard</managed-bean-name>
       <managed-bean-class>org.alfresco.web.bean.content.CreateXmlContentTypeWizard</managed-bean-class>
@@ -519,10 +520,6 @@
          <property-name>fileFolderService</property-name>
          <value>#{FileFolderService}</value>
       </managed-property>
-      <managed-property>
-         <property-name>searchService</property-name>
-         <value>#{SearchService}</value>
-      </managed-property>
       <managed-property>
          <property-name>navigator</property-name>
          <value>#{NavigationBean}</value>
@@ -535,9 +532,34 @@
          <property-name>contentService</property-name>
          <value>#{ContentService}</value>
       </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that backs up the Create Website Wizard
+      </description>
+      <managed-bean-name>CreateWebsiteWizard</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.wcm.CreateWebsiteWizard</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
       <managed-property>
-         <property-name>dictionaryService</property-name>
-         <value>#{DictionaryService}</value>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>fileFolderService</property-name>
+         <value>#{FileFolderService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>navigator</property-name>
+         <value>#{NavigationBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>avmService</property-name>
+         <value>#{AVMService}</value>
       </managed-property>
    </managed-bean>
    
diff --git a/source/web/images/icons/create_website.gif b/source/web/images/icons/create_website.gif
new file mode 100644
index 0000000000..0a55432118
Binary files /dev/null and b/source/web/images/icons/create_website.gif differ
diff --git a/source/web/images/icons/create_website_large.gif b/source/web/images/icons/create_website_large.gif
new file mode 100644
index 0000000000..1d1c87eb73
Binary files /dev/null and b/source/web/images/icons/create_website_large.gif differ
diff --git a/source/web/images/icons/website.gif b/source/web/images/icons/website.gif
new file mode 100644
index 0000000000..0a55432118
Binary files /dev/null and b/source/web/images/icons/website.gif differ
diff --git a/source/web/images/icons/website_large.gif b/source/web/images/icons/website_large.gif
new file mode 100644
index 0000000000..1d1c87eb73
Binary files /dev/null and b/source/web/images/icons/website_large.gif differ