diff --git a/sdonotifier/sdonotifier.info b/sdonotifier/sdonotifier.info
index e69de29..d80af14 100644
--- a/sdonotifier/sdonotifier.info
+++ b/sdonotifier/sdonotifier.info
@@ -0,0 +1,6 @@
+name = SDO notifier
+description = Notificaiton related customizations for security.drupal.org.
+dependencies[] = comment_acl
+dependencies[] = project_issue
+package = security.drupal.org
+core = 6.x
diff --git a/sdonotifier/sdonotifier.install b/sdonotifier/sdonotifier.install
index e69de29..eee1cf7 100644
--- a/sdonotifier/sdonotifier.install
+++ b/sdonotifier/sdonotifier.install
@@ -0,0 +1,5 @@
+<?php 
+
+function sdonotifier_install() {
+  db_query("UPDATE {system} SET weight = -1 WHERE name = 'sdonotifier'");
+}
\ No newline at end of file
diff --git a/sdonotifier/sdonotifier.module b/sdonotifier/sdonotifier.module
index e69de29..fb589a3 100644
--- a/sdonotifier/sdonotifier.module
+++ b/sdonotifier/sdonotifier.module
@@ -0,0 +1,74 @@
+<?php 
+
+/**
+ * @file Provides automatic notification/subscription for users who are granted access using comment_acl.
+ */
+
+function sdonotifier_comment(&$a1, $op) {
+  if ($op == 'insert') {
+    $comment = (object)$a1;
+    
+    if (!empty($comment->access_control['view'])) {
+      // Find the current users, the old users, and diff them to find newly added.
+      $new_users = comment_acl_parse_names($comment->access_control['view']);
+      $node = node_load($a1['nid']);
+      $acl_id = comment_acl_get_acl_id($node, 'view');
+      $current_users = (array) acl_get_uids($acl_id);
+      
+      $added_users = array_diff_key($new_users, $current_users);
+      $project_nid = $node->project_issue['pid'];
+      $project_node = node_load($project_nid);
+      foreach ($added_users as $uid => $user) {
+        $user = user_load($uid);
+        // Remove any current subscription to this proejct for this user.
+        db_query('DELETE FROM {project_subscriptions} WHERE nid = %d AND uid = %d', $project_nid, $user->uid);
+        // Add back a subscription to "All issues"
+        db_query('INSERT INTO {project_subscriptions} (nid, uid, level) VALUES (%d, %d, %d)', $project_nid, $user->uid, 2);
+        // TODO: Send them an e-mail letting them know they got invited to this issue.
+        $message['subject'] = t('[Drupal Security] Potential security vulnerability in @project_title.', array('project_title' => $project_node->title));
+        $message['body'] = sdonotifier_mailtext($user, $node, $project_node);
+        drupal_mail('sdonotifier', 'sdonotier_mail', $user->mail, language_default(), $message);
+      }
+    }
+  }
+}
+
+/**
+ * Provides the body of the mail message.
+ */
+function sdonotifier_mailtext($account, $node, $project_node) {
+  return t("
+Hello @name,
+
+The Drupal security team received report of possible vulnerabilities in the module @module_name.
+
+You have been granted access to the private issue at https://security.drupal.org/node/@issue_nid where you will find more details about the vulnerability. Please do NOT commit any code right away! 
+
+1. Please comment on the issue acknowledging that you are aware and working on it
+2. We invite you to suggest a fix by uploading a patch, or review any existing patch if one exists in the issue. 
+3. Be sure to read documentation on our process http://drupal.org/node/101497
+4. The security team can assist you if you have questions, and will ensure that the patch is valid from a security standpoint. Please keep this vulnerability a secret so as not to jeopardize the sites which are using this module.
+
+Security.drupal.org uses a system for single sign on, so you will need to be logged in at https://drupal.org/user before visiting the link above. 
+
+We encourage you to get e-mail notifications about any update in this issue by subscribing to the project at https://security.drupal.org/project/issues/subscribe-mail/@short_url
+
+Thanks,
+The Drupal Security team.",
+  array(
+    '@name' => $account->name, 
+    '@issue_nid' => $node->nid, 
+    '@module_name' => $project_node->title,
+    '@short_url' => $project_node->project['uri']));
+
+}
+
+/**
+ * Implements hook_mail().
+ */
+function sdonotifier_mail($key, &$message, $params) {
+  if ($key == 'sdonotier_mail') {
+    $message['subject'] = $params['subject'];
+    $message['body'][] = $params['body'];
+  }
+}