diff --git a/config/alfresco/bootstrap/spaces.xml b/config/alfresco/bootstrap/spaces.xml
index 18809f7e9a..bef0f1ec0f 100644
--- a/config/alfresco/bootstrap/spaces.xml
+++ b/config/alfresco/bootstrap/spaces.xml
@@ -97,18 +97,18 @@
             <cm:title>${spaces.guest_home.name}</cm:title>
             <cm:description>${spaces.guest_home.description}</cm:description>
          </cm:folder>
-         <cm:folder view:childName="app:WCM">
-         	<view:acl view:inherit="false">
-         		<view:ace view:access="ALLOWED">
-         			<view:authority>GROUP_EVERYONE</view:authority>
-         			<view:permission>Consumer</view:permission>
-         		</view:ace>
-         	</view:acl>
-         	<app:uifacets/>
-         	<cm:name>WCM</cm:name>
-         	<app:icon>space-icon-default</app:icon>
-         	<cm:title>WCM</cm:title>
-         	<cm:description>Web Content Management Spaces</cm:description>
+         <cm:folder view:childName="${spaces.wcm.childname}">
+            <view:acl view:inherit="false">
+               <view:ace view:access="ALLOWED">
+                  <view:authority>GROUP_EVERYONE</view:authority>
+                  <view:permission>Consumer</view:permission>
+               </view:ace>
+            </view:acl>
+            <app:uifacets/>
+            <cm:name>${spaces.wcm.name}</cm:name>
+            <app:icon>space-icon-default</app:icon>
+            <cm:title>${spaces.wcm.name}</cm:title>
+            <cm:description>${spaces.wcm.description}</cm:description>
          </cm:folder>
       </cm:contains>
    </cm:folder>
diff --git a/config/alfresco/import-export-context.xml b/config/alfresco/import-export-context.xml
index 6d6d0c9d3f..b56d30d461 100644
--- a/config/alfresco/import-export-context.xml
+++ b/config/alfresco/import-export-context.xml
@@ -263,6 +263,7 @@
                 <prop key="spaces.templates.rss.childname">${spaces.templates.rss.childname}</prop>
                 <prop key="spaces.savedsearches.childname">${spaces.savedsearches.childname}</prop>
                 <prop key="spaces.scripts.childname">${spaces.scripts.childname}</prop>
+                <prop key="spaces.wcm.childname">${spaces.wcm.childname}</prop>
             </props>
         </property>
     </bean>
diff --git a/config/alfresco/messages/bootstrap-spaces.properties b/config/alfresco/messages/bootstrap-spaces.properties
index 660be1d85e..f26dc76327 100644
--- a/config/alfresco/messages/bootstrap-spaces.properties
+++ b/config/alfresco/messages/bootstrap-spaces.properties
@@ -26,3 +26,6 @@ spaces.guest_home.description=The guest root space
 
 spaces.scripts.name=Scripts
 spaces.scripts.description=JavaScript files
+
+spaces.wcm.name=Websites
+spaces.wcm.description=Web Content Management Spaces
diff --git a/config/alfresco/model/applicationModel.xml b/config/alfresco/model/applicationModel.xml
index 078a7d17a1..1aaad3e754 100644
--- a/config/alfresco/model/applicationModel.xml
+++ b/config/alfresco/model/applicationModel.xml
@@ -49,6 +49,74 @@
          <title>Folder Link Object</title>
          <parent>cm:link</parent>
       </type>
+      
+      <type name="app:webfolder">
+         <title>AVM Website Folder</title>
+         <parent>cm:avmfolder</parent>
+         <properties>
+            <!-- root name of the avm staging store for this web folder -->
+            <property name="app:avmstore">
+               <type>d:text</type>
+            </property>
+         </properties>
+         <associations>
+            <child-association name="app:formtriples">
+               <source>
+                  <mandatory>false</mandatory>
+                  <many>false</many>
+               </source>
+               <target>
+                  <class>app:formtriple</class>
+                  <mandatory>false</mandatory>
+                  <many>true</many>
+               </target>
+            </child-association>
+            <child-association name="app:webuser">
+               <source>
+                  <mandatory>false</mandatory>
+                  <many>false</many>
+               </source>
+               <target>
+                  <class>app:webuser</class>
+                  <mandatory>false</mandatory>
+                  <many>true</many>
+               </target>
+            </child-association>
+         </associations>
+      </type>
+      
+      <type name="app:formtriple">
+         <title>Website Form Triple</title>
+         <parent>cm:cmobject</parent>
+         <properties>
+            <property name="app:form">
+               <type>d:noderef</type>
+               <mandatory>true</mandatory>
+            </property>
+            <property name="app:workflow">
+               <type>d:noderef</type>
+               <mandatory>true</mandatory>
+            </property>
+            <property name="app:script">
+               <type>d:noderef</type>
+            </property>
+         </properties>
+      </type>
+      
+      <type name="app:webuser">
+         <title>Website User Information</title>
+         <parent>cm:cmobject</parent>
+         <properties>
+            <property name="app:username">
+               <type>d:text</type>
+               <mandatory>true</mandatory>
+            </property>
+            <property name="app:role">
+               <type>d:text</type>
+               <mandatory>true</mandatory>
+            </property>
+         </properties>
+      </type>
 
 	</types>
 
diff --git a/config/alfresco/repository.properties b/config/alfresco/repository.properties
index 3bcaa68586..d679c9301a 100644
--- a/config/alfresco/repository.properties
+++ b/config/alfresco/repository.properties
@@ -103,6 +103,7 @@ spaces.templates.email.childname=app:email_templates
 spaces.templates.rss.childname=app:rss_templates
 spaces.savedsearches.childname=app:saved_searches
 spaces.scripts.childname=app:scripts
+spaces.wcm.childname=app:wcm
 
 # Folders for storing people
 
diff --git a/source/java/org/alfresco/model/ContentModel.java b/source/java/org/alfresco/model/ContentModel.java
index f24f634ab4..fd2f92fc79 100644
--- a/source/java/org/alfresco/model/ContentModel.java
+++ b/source/java/org/alfresco/model/ContentModel.java
@@ -231,7 +231,11 @@ public interface ContentModel
     static final QName ASPECT_FEEDSOURCE = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "feedsource");
     static final QName PROP_FEEDTEMPLATE = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "template");
     
-
+    // AVM web folder
+    static final QName TYPE_AVMWEBFOLDER = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "webfolder");
+    static final QName PROP_AVMSTORE = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "avmstore");
+    
+    
     //
     // User Model Definitions
     //