--- /Users/jrbeeman/Projects/drupal/nomod/drupal-6.0-beta2/modules/comment/comment.module	2007-10-16 07:22:00.000000000 -0700
+++ comment.module	2007-10-28 17:30:50.000000000 -0700
@@ -1756,7 +1756,13 @@
 function comment_form_submit($form, &$form_state) {
   _comment_form_submit($form_state['values']);
   if ($cid = comment_save($form_state['values'])) {
-    $form_state['redirect'] = array('node/'. $form_state['values']['nid'], NULL, "comment-$cid");
+    $node = node_load($form_state['values']['nid']);
+    $comment_num = comment_num_all($node->nid);
+    $comments_per_page = variable_get('comment_default_per_page_'.$node->type, 50);
+    $page = floor($comment_num / $comments_per_page);
+    $query = $page ? 'page=' . $page : NULL;
+    $redirect = array('node/'. $node->nid, $query, "comment-$cid");
+    $form_state['redirect'] = array('node/'. $node->nid, $query, "comment-$cid");
     return;
   }
 }