diff --git a/facebook_comments.install b/facebook_comments.install
index b051633..5f5d07c 100644
--- a/facebook_comments.install
+++ b/facebook_comments.install
@@ -33,8 +33,29 @@ function facebook_comments_schema() {
           'not null' => TRUE,
           'default' => 15,
         ),
+        'notify' => array(
+          'description' => 'Notify author on post',
+          'type' => 'int',
+          'unsigned' => TRUE,
+          'not null' => TRUE,
+          'default' => 0,
+        ),
       ),
       'primary key' => array('nid'),
     ),
   );
 }
+
+/**
+ * Implements hook_update_N().
+ */
+function facebook_comments_update_7001() {
+  $spec = array(
+    'description' => 'Notify author on post',
+    'type' => 'int',
+    'unsigned' => TRUE,
+    'not null' => TRUE,
+    'default' => 0,
+  );
+  db_add_field('facebook_comments', 'notify', $spec);
+}
diff --git a/facebook_comments.js b/facebook_comments.js
new file mode 100644
index 0000000..400a854
--- /dev/null
+++ b/facebook_comments.js
@@ -0,0 +1,14 @@
+
+(function ($) {
+
+  $(window).bind("load", function() {
+    FB.Event.subscribe('comment.create', function(response) {
+      var notify_url = Drupal.settings.facebook_comments_url;
+      var notify_nid = Drupal.settings.facebook_comments_nid;
+      $.post(notify_url, {
+        "url": response.href, "id": response.commentID, "nid": notify_nid
+      });
+    });
+  });
+
+})(jQuery);
diff --git a/facebook_comments.module b/facebook_comments.module
index 0b9c847..d952c5d 100644
--- a/facebook_comments.module
+++ b/facebook_comments.module
@@ -26,6 +26,12 @@ function facebook_comments_menu() {
     'page arguments' => array('facebook_comments_admin'),
     'access arguments' => array('administer facebook comments'),
   );
+  $items['facebook-comments-notify'] = array(
+    'title' => 'Facebook comments notify',
+    'description' => 'Notifies administrators when a Facebook comment is posted.',
+    'page callback' => 'facebook_comments_notify',
+    'access callback' => TRUE
+  );
   return $items;
 }
 
@@ -122,6 +128,23 @@ function facebook_comments_admin() {
     '#title' => t('Enable Facebook comments on existing content for the selected content types.'),
     '#default_value' => FALSE,
   );
+  $form['facebook_comments_notify'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Notify when a comment is posted.'),
+    '#default_value' => variable_get('facebook_comments_notify'),
+  );
+  $form['facebook_comments_notify_emails'] = array(
+    '#type' => 'textfield',
+    '#title' => t('E-mail addresses'),
+    '#description' => t('These users will be notified for every comment. Add multiple separated by comma.'),
+    '#default_value' => variable_get('facebook_comments_notify_emails'),
+    '#states' => array(
+      'visible' => array(
+        'input[name="facebook_comments_notify"]' => array('checked' => TRUE),
+      ),
+    ),
+  );
+
   $form['#submit'][] = 'facebook_comments_admin_applyall';
   return system_settings_form($form);
 }
@@ -152,6 +175,30 @@ function facebook_comments_admin_applyall(&$form, $form_state) {
 }
 
 /**
+ * Implements hook_field_extra_fields().
+ */
+function facebook_comments_field_extra_fields() {
+  $extra = array();
+
+  $default_types = variable_get('facebook_comments_types', array());
+  foreach (node_type_get_types() as $type) {
+    if (isset($default_types[$type->type])) {
+      $extra['node'][$type->type] = array(
+        'display' => array(
+          'facebook_comments' => array(
+            'label' => t('Facebook comments'),
+            'description' => t('Facebook comments'),
+            'weight' => 1002,
+          ),
+        ),
+      );
+    }
+  }
+
+  return $extra;
+}
+
+/**
  * Implements hook_form_alter().
  *
  * Add the Facebook commenting options for a node.
@@ -170,7 +217,7 @@ function facebook_comments_form_node_form_alter(&$form, $form_state) {
   elseif (isset($node->nid) && $node->nid > 0) {
     // Load the values from the db if we are viewing an existing node.
     $defaults = db_select('facebook_comments', 'f')
-      ->fields('f', array('enabled', 'amount'))
+      ->fields('f', array('enabled', 'amount', 'notify'))
       ->condition('f.nid', $node->nid, '=')
       ->execute()
       ->fetchObject();
@@ -209,6 +256,12 @@ function facebook_comments_form_node_form_alter(&$form, $form_state) {
     '#title' => t('Enable Facebook comments'),
     '#default_value' => $defaults->enabled,
   );
+  // Enable or disable Facebook comments for this node
+  $form['facebook_comments']['facebook_comments_notify'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Notify on comment'),
+    '#default_value' => $defaults->notify,
+  );
   // Amount of comments
   $form['facebook_comments']['facebook_comments_amount'] = array(
     '#type' => 'select',
@@ -228,7 +281,8 @@ function facebook_comments_node_insert($node) {
         'nid' => $node->nid,
         'enabled' => $node->facebook_comments_enabled,
         'amount' => $node->facebook_comments_amount,
-    ))
+        'notify' => $node->facebook_comments_notify,
+      ))
     ->execute();
   }
 }
@@ -243,6 +297,7 @@ function facebook_comments_node_update($node) {
       ->fields(array(
         'enabled' => $node->facebook_comments_enabled,
         'amount' => $node->facebook_comments_amount,
+        'notify' => $node->facebook_comments_notify,
       ))
       ->execute();
   }
@@ -266,7 +321,7 @@ function facebook_comments_node_view($node, $view_mode, $langcode) {
   if ($fc_viewmode != "both" && $view_mode != $fc_viewmode) return;
   // Check if Facebook comments are enabled for this node
   $comments = db_select('facebook_comments', 'f')
-    ->fields('f', array('enabled', 'amount'))
+    ->fields('f', array('enabled', 'amount', 'notify'))
     ->condition('f.nid', $node->nid, '=')
     ->execute()
     ->fetchObject();
@@ -279,6 +334,17 @@ function facebook_comments_node_view($node, $view_mode, $langcode) {
     '#markup' => $output,
     '#weight' => 1002,
   );
+
+  // Add notify javascript, but only on full.
+  if ($view_mode == 'full' && variable_get('facebook_comments_notify')) {
+    $node->content['facebook_comments']['#attached']['js'][] = drupal_get_path('module', 'facebook_comments') . '/facebook_comments.js';
+    // Send base URL so we can construct the post URL.
+    drupal_add_js(array(
+      'facebook_comments_url' => url('facebook-comments-notify', array('absolute' => TRUE)),
+      'facebook_comments_nid' => $comments->notify ? $node->nid : FALSE),
+      'setting'
+    );
+  }
 }
 
 /**
@@ -324,3 +390,68 @@ function facebook_comments_display($width, $amount, $fluid = 0) {
 <div class="fb-comments ' . $class . '" data-href="' . $url . '" data-num-posts="' . $amount . '" data-width="' . $width . '" data-colorscheme="' . $style . '"></div>';
   return $output;
 }
+
+/**
+ * Menu callback: notifies administrators that a comment has been posted.
+ */
+function facebook_comments_notify() {
+
+  // Bail out immediately.
+  if (!variable_get('facebook_comments_notify')) {
+    return;
+  }
+
+  // Check global emails.
+  $to = explode(',', variable_get('facebook_comments_notify_emails'));
+  array_walk($to, 'trim');
+  if (empty($to)) {
+    return;
+  }
+
+  // Get post variables.
+  $url = $_POST['url'];
+  $id = $_POST['id'];
+  $nid = $_POST['nid'];
+
+  if (!empty($url) && !empty($id)) {
+
+    // Check if the author needs to be notified.
+    if (!empty($nid)) {
+
+      $comments = db_select('facebook_comments', 'f')
+        ->fields('f', array('enabled', 'amount', 'notify'))
+        ->condition('f.nid', $nid, '=')
+        ->execute()
+        ->fetchObject();
+
+      if (!empty($comments->enabled) && !empty($comments->notify)) {
+        $node = node_load($nid);
+        if ($node->uid) {
+          $account = user_load($node->uid);
+          $to[] = $account->mail;
+        }
+      }
+    }
+
+    // Construct to.
+    $to = implode(', ', $to);
+    if (empty($to)) {
+      return;
+    }
+
+    // Send out mail.
+    global $user;
+    $params = array();
+    $params['subject'] = t('A facebook comment with ID @id has been posted.', array('@id' => $id));
+    $params['body'] = t('Go to @url to see the comment.', array('@url' => $url));
+    drupal_mail('facebook_comments', 'notify', $to, user_preferred_language($user), $params);
+  }
+}
+
+/**
+ * Implements hook_mail().
+ */
+function facebook_comments_mail($key, &$message, $params) {
+  $message['subject'] = $params['subject'];
+  $message['body'][] = $params['body'];
+}
