diff --git a/config/alfresco/core-services-context.xml b/config/alfresco/core-services-context.xml
index fd17fd7ed0..ff0aa7a6df 100644
--- a/config/alfresco/core-services-context.xml
+++ b/config/alfresco/core-services-context.xml
@@ -778,6 +778,9 @@
                 
                 <!-- Share Data Lists model -->
                 <value>alfresco/model/datalistModel.xml</value>
+                
+                <!-- QuickShare (aka PublicView) -->
+                <value>alfresco/model/quickShareModel.xml</value>
             </list>
         </property>
         <property name="labels">
diff --git a/config/alfresco/model/quickShareModel.xml b/config/alfresco/model/quickShareModel.xml
new file mode 100644
index 0000000000..bc685c5596
--- /dev/null
+++ b/config/alfresco/model/quickShareModel.xml
@@ -0,0 +1,41 @@
+<model name="qshare:qsharemodel" xmlns="http://www.alfresco.org/model/dictionary/1.0">
+
+  <description>QuickShare Model Definitions</description>
+  <version>0.1</version>
+  
+  <imports>
+    <import uri="http://www.alfresco.org/model/dictionary/1.0" prefix="d" />
+  </imports>
+  
+  <namespaces>
+    <namespace uri="http://www.alfresco.org/model/qshare/1.0" prefix="qshare" />
+  </namespaces>
+  
+  <aspects>
+  
+    <aspect name="qshare:shared">
+      <properties>
+        <property name="qshare:sharedId">
+          <title>Shared Id</title>
+          <type>d:text</type>
+          <protected>true</protected>
+          <mandatory enforced="true">true</mandatory>
+          <multiple>false</multiple>
+          <index enabled="true">
+            <tokenised>false</tokenised>
+          </index>
+        </property>
+        <property name="qshare:sharedBy">
+          <title>Shared By</title>
+          <type>d:text</type>
+          <protected>true</protected>
+          <mandatory enforced="true">true</mandatory>
+          <multiple>false</multiple>
+          <index enabled="true">
+            <tokenised>false</tokenised>
+          </index>
+        </property>
+      </properties>
+    </aspect>
+  </aspects>
+</model>
\ No newline at end of file
diff --git a/config/alfresco/repository.properties b/config/alfresco/repository.properties
index 286a29f313..210683ae24 100644
--- a/config/alfresco/repository.properties
+++ b/config/alfresco/repository.properties
@@ -1017,3 +1017,6 @@ ticket.cleanup.cronExpression=0 0 * * * ?
 # Disable load of sample site
 #
 sample.site.disabled=false
+
+# enable QuickShare - if false then the QuickShare-specific REST APIs will return 403 Forbidden
+system.quickshare.enabled=true
\ No newline at end of file
diff --git a/config/alfresco/script-services-context.xml b/config/alfresco/script-services-context.xml
index 058ef44570..7d69b68e92 100644
--- a/config/alfresco/script-services-context.xml
+++ b/config/alfresco/script-services-context.xml
@@ -266,6 +266,7 @@
     			<value>cm:workingCopyOwner</value>
     			<value>cm:lockOwner</value>
     			<value>cm:owner</value>
+            <value>qshare:sharedBy</value>
     		</set>
    		</property>
     </bean>
diff --git a/source/java/org/alfresco/model/QuickShareModel.java b/source/java/org/alfresco/model/QuickShareModel.java
new file mode 100644
index 0000000000..434458e320
--- /dev/null
+++ b/source/java/org/alfresco/model/QuickShareModel.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2005-2012 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.model;
+
+import org.alfresco.service.namespace.QName;
+
+
+/**
+ * QuickShare Model Constants
+ * 
+ * @author janv
+ */
+public interface QuickShareModel
+{
+    // Namespaces
+    static final String QSHARE_MODEL_1_0_URI = "http://www.alfresco.org/model/qshare/1.0";
+    
+    // Aspects
+    static final QName ASPECT_QSHARE = QName.createQName(QSHARE_MODEL_1_0_URI, "shared");
+    
+    // Properties
+    static final QName PROP_QSHARE_SHAREDID = QName.createQName(QSHARE_MODEL_1_0_URI, "sharedId");
+    static final QName PROP_QSHARE_SHAREDBY = QName.createQName(QSHARE_MODEL_1_0_URI, "sharedBy");
+}