Index: wp-admin/options-discussion.php
===================================================================
--- wp-admin/options-discussion.php	(revision 25671)
+++ wp-admin/options-discussion.php	(working copy)
@@ -5,7 +5,6 @@
  * @package WordPress
  * @subpackage Administration
  */
-
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
@@ -132,18 +131,22 @@
 </fieldset></td>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('Before a comment appears'); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Before a comment appears'); ?></span></legend>
-<label for="comment_moderation">
-<input name="comment_moderation" type="checkbox" id="comment_moderation" value="1" <?php checked('1', get_option('comment_moderation')); ?> />
-<?php _e('Comment must be manually approved'); ?> </label>
-<br />
-<label for="comment_whitelist"><input type="checkbox" name="comment_whitelist" id="comment_whitelist" value="1" <?php checked('1', get_option('comment_whitelist')); ?> /> <?php _e('Comment author must have a previously approved comment'); ?></label>
-</fieldset></td>
-</tr>
-<tr valign="top">
 <th scope="row"><?php _e('Comment Moderation'); ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php _e('Comment Moderation'); ?></span></legend>
+<label for="comment_moderation_manually_approved">
+	<input name="comment_moderation" id="comment_moderation_manually_approved" type="radio" value="manually_approve" <?php checked( 'manually_approve', get_option( 'comment_moderation' ) ) ?> />
+	<?php _e( 'All comments must be manually approved' ); ?>
+</label>
+<br />
+<label for="comment_moderation_whitelist_previous_commenters">
+	<input name="comment_moderation" id="comment_moderation_whitelist_previous_commenters" type="radio" value="whitelist_previous_commenters" <?php checked( 'whitelist_previous_commenters', get_option( 'comment_moderation' ) ) ?> />
+	<?php _e( 'Only comments by new commenters must be approved' ); ?>
+</label>
+<br />
+<label for="comment_moderation_approve_all">
+	<input name="comment_moderation" id="comment_moderation_approve_all" type="radio" value="approve_all" <?php checked( 'approve_all', get_option( 'comment_moderation' ) ) ?> />
+	<?php _e( 'All comments are automatically approved' ); ?>
+</label>
 <p><label for="comment_max_links"><?php printf(__('Hold a comment in the queue if it contains %s or more links. (A common characteristic of comment spam is a large number of hyperlinks.)'), '<input name="comment_max_links" type="number" step="1" min="0" id="comment_max_links" value="' . esc_attr(get_option('comment_max_links')) . '" class="small-text" />' ); ?></label></p>
 
 <p><label for="moderation_keys"><?php _e('When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be held in the <a href="edit-comments.php?comment_status=moderated">moderation queue</a>. One word or IP per line. It will match inside words, so &#8220;press&#8221; will match &#8220;WordPress&#8221;.'); ?></label></p>
Index: wp-admin/includes/upgrade.php
===================================================================
--- wp-admin/includes/upgrade.php	(revision 25671)
+++ wp-admin/includes/upgrade.php	(working copy)
@@ -402,6 +402,9 @@
 	if ( $wp_current_db_version < 22422 )
 		upgrade_350();
 
+	if ( $wp_current_db_version < 25448 )
+		upgrade_comment_moderation_option();
+
 	maybe_disable_link_manager();
 
 	maybe_disable_automattic_widgets();
@@ -1209,6 +1212,19 @@
 }
 
 /**
+ * Temporary function to be rolled into next upgrade_{next_major_version}() function.
+ */
+function upgrade_comment_moderation_option() {
+	if ( get_option( 'comment_moderation' ) )
+		update_option( 'comment_moderation', 'manually_approve' );
+	else if ( get_option( 'comment_whitelist' ) )
+		update_option( 'comment_moderation', 'whitelist_previous_commenters' );
+	else
+		update_option( 'comment_moderation', 'approve_all' );
+	delete_option( 'comment_whitelist' );
+}
+
+/**
  * Execute network level changes
  *
  * @since 3.0.0