diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index c9fe612e8ee446092d121c8ed49aeadc667d8d33..d15de48fbf3ae8459379b1dc5923f93ff48dda7d 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -27,6 +27,7 @@ Drupal 6.0, xxxx-xx-xx (development version)
     * Check for clean URL support automatically with JavaScript.
     * Removed default/settings.php. Instead the installer will create it from default.settings.php.
     * Made it possible to configure your own date formats.
+    * Remember anonymous comment posters.
 - Theme system:
     * Added .info files to themes and made it easier to specify regions and features.
     * Added theme registry: modules can directly provide .tpl.php files for their themes without having to create theme_ functions.
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index 91b02a43b01f2400bd0b2c41c4c43a319159e214..5adcdd4982c24124f57019a9d49fa27d08804c49 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -1458,6 +1458,10 @@ function comment_form($edit, $title = NULL) {
 
   $op = isset($_POST['op']) ? $_POST['op'] : '';
 
+  if (!$user->uid && variable_get('comment_anonymous', COMMENT_ANONYMOUS_MAYNOT_CONTACT) != COMMENT_ANONYMOUS_MAYNOT_CONTACT) {
+    drupal_add_js(drupal_get_path('module', 'comment') . '/comment.js');
+  }
+
   if ($user->uid) {
     if (!empty($edit['cid']) && user_access('administer comments')) {
       if (!empty($edit['author'])) {
@@ -1681,6 +1685,10 @@ function comment_form_add_preview($form, $edit, &$form_state) {
 }
 
 function comment_form_validate($form_values, $form, &$form_state) {
+  foreach (array('name', 'homepage', 'mail') as $field) {
+    //set cookie for 365 days
+    setrawcookie('comment_info_' . $field, rawurlencode($form_values[$field]), time() + 31536000);
+  }
   comment_validate($form_values);
 }