diff --git a/mollom.js b/mollom.js
index cf9482b..8898536 100644
--- a/mollom.js
+++ b/mollom.js
@@ -1,13 +1,13 @@
 (function ($) {
 
 /**
- * Open Mollom privacy policy link in a new window.
+ * Open links to Mollom.com in a new window.
  *
  * Required for valid XHTML Strict markup.
  */
-Drupal.behaviors.mollomPrivacy = {
+Drupal.behaviors.mollomTarget = {
   attach: function (context) {
-    $('.mollom-privacy a', context).click(function () {
+    $(context).find('.mollom-target').click(function () {
       this.target = '_blank';
     });
   }
diff --git a/mollom.module b/mollom.module
index 8c8734c..c31472a 100644
--- a/mollom.module
+++ b/mollom.module
@@ -738,7 +738,7 @@ function mollom_form_alter(&$form, &$form_state, $form_id) {
         $form['mollom']['privacy'] = array(
           '#prefix' => '<div class="description mollom-privacy">',
           '#suffix' => '</div>',
-          '#markup' => t('By submitting this form, you accept the <a href="@privacy-policy-url">Mollom privacy policy</a>.', array(
+          '#markup' => t('By submitting this form, you accept the <a href="@privacy-policy-url" class="mollom-target">Mollom privacy policy</a>.', array(
             '@privacy-policy-url' => 'http://mollom.com/web-service-privacy-policy',
           )),
           '#weight' => 10,
@@ -2377,6 +2377,7 @@ function mollom_get_captcha(&$form_state) {
 
     case 'image':
       $captcha = theme('image', array('path' => $url, 'alt' => t('Type the characters you see in this picture.'), 'getsize' => FALSE));
+      $captcha = '<a href="//mollom.com/captcha" class="mollom-target">' . $captcha . '</a>';
       $output = '<span class="mollom-captcha-content mollom-image-captcha">' . $captcha . '</span>';
       $output .= ' (<a href="#" class="mollom-switch-captcha mollom-audio-captcha">' . t('verify using audio') . '</a>)';
       break;