Index: wp-admin/includes/update.php
===================================================================
--- wp-admin/includes/update.php	(revision 6163)
+++ wp-admin/includes/update.php	(working copy)
@@ -28,6 +28,10 @@
 function update_nag() {
 	$cur = get_option( 'update_core' );
 
+	if (!get_option("check_updates") && current_user_can('manage_options')){
+		echo "<div id='update-nag'>".__('Please <a href="options-privacy.php">select</a> if you would like to have auto-updates enabled')."</div>";
+		return;
+	}
 	if ( ! isset( $cur->response ) || $cur->response != 'upgrade' )
 		return false;
 
@@ -42,6 +46,8 @@
 
 function wp_update_plugins() {
 	global $wp_version;
+	if (get_option("check_updates")!='true')
+		return;
 
 	if ( !function_exists('fsockopen') )
 		return false;
Index: wp-admin/options-privacy.php
===================================================================
--- wp-admin/options-privacy.php	(revision 6163)
+++ wp-admin/options-privacy.php	(working copy)
@@ -22,11 +22,22 @@
 <?php do_action('blog_privacy_selector'); ?>
 </td>
 </tr>
+<tr valign="top">
+<th scope="row"><?php _e('Automatic Update Notification:') ?> </th>
+<td>
+<p><input id="check_updates" type="radio" name="check_updates" value="true" <?php checked("true", get_option('check_updates')); ?> />
+<label for="check_updates"><?php _e('I would like for my Wordpress to automatically connect to wordpress.org and check for updated versions of Wordpress and my plugins');?></label></p>
+<p><input id="no_update_check" type="radio" name="check_updates" value="false" <?php checked("false", get_option('check_updates')); ?> />
+<label for="no_update_check"><?php _e('No thanks. I understand that I will be responsible to check for updated versions of Wordpress and my plugins.');?></label></p>
+<p><em>Note that during this check certain information is sent to the wordpress.org servers. This information includes your current version, version of PHP and URL of your site.</p>
+<?php do_action('blog_privacy_selector'); ?>
+</td>
+</tr>
 </table>
 
 <p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" />
 <input type="hidden" name="action" value="update" />
-<input type="hidden" name="page_options" value="blog_public" />
+<input type="hidden" name="page_options" value="blog_public,check_updates" />
 </p>
 </form>
 
Index: wp-includes/update.php
===================================================================
--- wp-includes/update.php	(revision 6163)
+++ wp-includes/update.php	(working copy)
@@ -8,6 +8,8 @@
 
 	global $wp_version;
 	$php_version = phpversion();
+	if (get_option("check_updates")!='true')
+		return;
 
 	$current = get_option( 'update_core' );
 	$locale = get_locale();