diff --git a/config/alfresco/templates/activities/org/alfresco/comments/comment-created.atomentry.ftl b/config/alfresco/templates/activities/org/alfresco/comments/comment-created.atomentry.ftl
new file mode 100644
index 0000000000..5cd3a44e46
--- /dev/null
+++ b/config/alfresco/templates/activities/org/alfresco/comments/comment-created.atomentry.ftl
@@ -0,0 +1,17 @@
+<#assign username=userId>
+<#if firstName?exists>
+   <#assign username = firstName + " " + lastName>
+</#if>
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>New comment for ${(itemTitle!'')?html}</title>
+   <link rel="alternate" type="text/html" href="${(browsePostUrl!'')?replace("&", "&amp;")}" />
+   <id>${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[${username} added a comment to <a href="${(browseItemUrl!'')}">${itemTitle!'unknown'}</a>]]>
+   </summary>
+   <author>
+   <name>${userId!""}</name>
+   </author> 
+</entry>
+
diff --git a/config/alfresco/templates/activities/org/alfresco/comments/comment-deleted.atomentry.ftl b/config/alfresco/templates/activities/org/alfresco/comments/comment-deleted.atomentry.ftl
new file mode 100644
index 0000000000..e0c65d3479
--- /dev/null
+++ b/config/alfresco/templates/activities/org/alfresco/comments/comment-deleted.atomentry.ftl
@@ -0,0 +1,17 @@
+<#assign username=userId>
+<#if firstName?exists>
+   <#assign username = firstName + " " + lastName>
+</#if>
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>Comment deleted</title>
+   <link rel="alternate" type="text/html" href="${(browsePostListUrl!'')?replace("&", "&amp;")}" />
+   <id>${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[${username} deleted comment on <a href="${(browseItemUrl!'')}">${itemTitle!'unknown'}</a>]]>
+   </summary>
+   <author>
+   <name>${userId!""}</name>
+   </author> 
+</entry>
+
diff --git a/config/alfresco/templates/activities/org/alfresco/comments/comment-updated.atomentry.ftl b/config/alfresco/templates/activities/org/alfresco/comments/comment-updated.atomentry.ftl
new file mode 100644
index 0000000000..b49f316306
--- /dev/null
+++ b/config/alfresco/templates/activities/org/alfresco/comments/comment-updated.atomentry.ftl
@@ -0,0 +1,17 @@
+<#assign username=userId>
+<#if firstName?exists>
+   <#assign username = firstName + " " + lastName>
+</#if>
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>Comment updated</title>
+   <link rel="alternate" type="text/html" href="${(browsePostUrl!'')?replace("&", "&amp;")}" />
+   <id>${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[${username} updated comment on <a href="${(browseItemUrl!'')}">${itemTitle!'unknown'}</a>]]>
+   </summary>
+   <author>
+   <name>${userId!""}</name>
+   </author> 
+</entry>
+
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.delete.js b/config/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.delete.js
index ac06dbf766..4e528a7577 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.delete.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.delete.js
@@ -28,6 +28,19 @@ function main()
    }
 
    deleteComment(node);
+   
+   // post an activitiy item, but only if we got a site
+   if ((args["site"] != undefined) &&
+       (args["container"] != undefined) &&
+       (args["itemTitle"] != undefined) &&
+       (args["browseItemUrl"] != undefined))
+   {
+      var data = {
+          itemTitle: decodeURIComponent(args["itemTitle"]),
+          browseItemUrl: decodeURIComponent(args["browseItemUrl"])
+      }
+      activities.postActivity("org.alfresco.comments.comment-deleted", args["site"], args["container"], jsonUtils.toJSONString(data));
+   }
 }
 
 main();
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.put.js b/config/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.put.js
index 4cb028171a..d6be12cdd3 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.put.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.put.js
@@ -30,9 +30,21 @@ function main()
    }
 
    // update comment
-   updateComment(node);
-   
+   updateComment(node);   
    model.item = getCommentData(node);
+   
+   // post an activitiy item, but only if we got a site
+   if (json.has("site") &&
+       json.has("container") &&
+       json.has("itemTitle") &&
+       json.has("browseItemUrl"))
+   {
+      var data = {
+          itemTitle: json.get("itemTitle"),
+          browseItemUrl: json.get("browseItemUrl")
+      }
+      activities.postActivity("org.alfresco.comments.comment-updated", json.get("site"), json.get("container"), jsonUtils.toJSONString(data));
+   }
 }
 
 main();
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/comments/comments.post.js b/config/alfresco/templates/webscripts/org/alfresco/repository/comments/comments.post.js
index 7eb174d2e6..d0650716ea 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/comments/comments.post.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/comments/comments.post.js
@@ -42,6 +42,19 @@ function main()
 
    var comment = addComment(node);
    model.item = getCommentData(comment);
+   
+   // post an activitiy item, but only if we got a site
+   if (json.has("site") &&
+       json.has("container") &&
+       json.has("itemTitle") &&
+       json.has("browseItemUrl"))
+   {
+      var data = {
+          itemTitle: json.get("itemTitle"),
+          browseItemUrl: json.get("browseItemUrl")
+      }
+      activities.postActivity("org.alfresco.comments.comment-created", json.get("site"), json.get("container"), jsonUtils.toJSONString(data));
+   }
 }
 
 main();