diff --git a/config/alfresco/repository.properties b/config/alfresco/repository.properties
index 0a6e68bd90..e786b4761b 100644
--- a/config/alfresco/repository.properties
+++ b/config/alfresco/repository.properties
@@ -36,6 +36,7 @@ location.license.shared=classpath*:/alfresco/extension/license/*.lic
 system.webdav.servlet.enabled=true
 system.webdav.storeName=${protocols.storeName}
 system.webdav.rootPath=${protocols.rootPath}
+system.webdav.activities.enabled=false
 
 # Is the JBPM Deploy Process Servlet enabled?
 # Default is false. Should not be enabled in production environments as the
diff --git a/config/alfresco/webdav-context.xml b/config/alfresco/webdav-context.xml
index fbf9728ec5..da67b8d7bd 100644
--- a/config/alfresco/webdav-context.xml
+++ b/config/alfresco/webdav-context.xml
@@ -21,7 +21,8 @@
         <property name="nodeService" ref="NodeService" />
         <property name="fileFolderService" ref="FileFolderService" />
         <property name="rootNode" ref="webdavRootNode" />
-        <property name="enabled" ><value>${system.webdav.servlet.enabled}</value></property>
+        <property name="enabled"><value>${system.webdav.servlet.enabled}</value></property>
+        <property name="activitiesEnabled" value="${system.webdav.activities.enabled}"/>
     </bean>
     
     <bean id="webdavLockStoreFactory" class="org.alfresco.repo.webdav.LockStoreFactoryImpl">
diff --git a/source/java/org/alfresco/repo/webdav/WebDavServiceImpl.java b/source/java/org/alfresco/repo/webdav/WebDavServiceImpl.java
index d8ef275ca5..29b680a910 100644
--- a/source/java/org/alfresco/repo/webdav/WebDavServiceImpl.java
+++ b/source/java/org/alfresco/repo/webdav/WebDavServiceImpl.java
@@ -46,18 +46,16 @@ import org.springframework.extensions.surf.util.URLEncoder;
  */
 public class WebDavServiceImpl implements WebDavService
 {
-    public static final String WEBDAV_PREFIX = "webdav"; 
-    
+    public static final String WEBDAV_PREFIX = "webdav";    
     private static Log logger = LogFactory.getLog(WebDavServiceImpl.class);
-    
     private boolean enabled = false;
-    
     private NodeService nodeService;
     private DictionaryService dictionaryService;
-    private FileFolderService fileFolderService;
-  
+    private FileFolderService fileFolderService;  
     // Root nodes
     private MTNodesCache2 rootNode;
+    private boolean activitiesEnabled;
+
     
     
     /**
@@ -185,5 +183,16 @@ public class WebDavServiceImpl implements WebDavService
     public MTNodesCache2 getRootNode()
     {
         return rootNode;
-    }  
+    }
+
+    @Override
+    public boolean activitiesEnabled()
+    {
+        return activitiesEnabled;
+    }
+    
+    public void setActivitiesEnabled(boolean enabled)
+    {
+        activitiesEnabled = enabled;
+    }
 }
diff --git a/source/java/org/alfresco/service/cmr/webdav/WebDavService.java b/source/java/org/alfresco/service/cmr/webdav/WebDavService.java
index 604f459d01..1119024c0c 100644
--- a/source/java/org/alfresco/service/cmr/webdav/WebDavService.java
+++ b/source/java/org/alfresco/service/cmr/webdav/WebDavService.java
@@ -28,5 +28,13 @@ public interface WebDavService
      * @return the URL of the node in webdav or "" if a URL cannot be built.
      */
     public String getWebdavUrl(NodeRef nodeRef);
-
+    
+    /**
+     * Determines whether activity post generation is enabled for WebDAV. When enabled,
+     * file creation, modification and deletion will create activities that can be viewed
+     * in the Share web client.
+     * 
+     * @return true if activity generation is enabled.
+     */
+    public boolean activitiesEnabled();
 }