Index: wp-admin/includes/upgrade.php
===================================================================
--- wp-admin/includes/upgrade.php	(revision 18633)
+++ wp-admin/includes/upgrade.php	(working copy)
@@ -84,6 +84,9 @@
 
 	$wp_rewrite->flush_rules();
 
+	/* New install - show welcome screen */
+	$guessurl .= '/wp-admin/index.php?welcome=1';
+
 	wp_new_blog_notification($blog_title, $guessurl, $user_id, ($email_password ? $user_password : __('The password you chose during the install.') ) );
 
 	wp_cache_flush();
Index: wp-admin/includes/template.php
===================================================================
--- wp-admin/includes/template.php	(revision 18633)
+++ wp-admin/includes/template.php	(working copy)
@@ -1750,6 +1750,114 @@
 
 ?>
 <div id="screen-meta">
+<?php if ( current_user_can('activate_plugins') && strpos($_SERVER['SCRIPT_FILENAME'],'index.php') !== false) { ?>
+<div id="welcome-screen-wrap" class="hidden">
+<div class="metabox-prefs">
+	<?php $additional_tabs = Array(); $additional_tabs = apply_filters('admin_welcome_screen_moretabs',$additional_tabs); ?>
+	<h1><?php echo sprintf(__("Welcome to WordPress %s!"),$GLOBALS['wp_version']); ?></h1>
+	<div id="welcometabs" class="widget">
+	    <ul class="tabnav">
+	    	<li><a href="#welcome"><?php _e('Welcome to WordPress'); ?></a></li>
+	    	<li><a href="#privacy"><?php _e('Privacy'); ?></a></li>
+	    	<li><a href="#info">Server Information</a></li>
+	    	<?php foreach($additional_tabs as $key => $value) {
+				echo '<li><a href="#' . sanitize_key($key) . "\">$key</a></li>";
+			}; ?>
+	    </ul>
+	    <div id="welcome" class="tabdiv">
+	    <?php echo sprintf(__('<p>Here\'s what\'s new in this version of WordPress: <br /><a href="http://codex.wordpress.org/Changelog/%1$s" title="WordPress Version %1$s">ChangeLog</a></p>'),$GLOBALS['wp_version']); ?>
+	   <?php echo sprintf(__('
+	   <p>Thank you for choosing WordPress. The following links will help you get started with your WordPress experience:</p>
+	<ul> 
+		<li>Edit your personal information at <a href="%1$s/wp-admin/profile.php" title="Edit settings like your password, your display name and your contact information">Users &#8250; Your Profile</a></li> 
+		<li>Tell WordPress what your site is all about with a short one-line tagline at <a href="%1$s/wp-admin/options-general.php" title="Edit your site\'s important settings such as your tagline">Settings &#8250; General</a></li>
+		<li>Start publishing at <a href="%1$s/wp-admin/post-new.php" title="Create a new post">Posts &#8250; Add New</a> and at <a href="%1$s/wp-admin/post-new.php?post_type=page" title="Create a new page">Pages &#8250; Add New</a></li> 
+		<li>Browse and install plugins at <a href="%1$s/wp-admin/plugin-install.php" title="Browse and install plugins">Plugins &#8250; Add New</a></li> 
+		<li>Browse and install themes at <a href="%1$s/wp-admin/theme-install.php" title="Browse and install themes">Appearance &#8250; Add New Themes</a></li> 
+		<li>Modify your website&#8217;s link structure at <a href="%1$s/wp-admin/options-permalink.php" title="For example, select a link structure like: http://example.com/1999/12/post-name">Settings &#8250; Permalinks</a></li> 
+		<li>Import content from another system or WordPress site at <a href="%1$s/wp-admin/import.php" title="WordPress comes with importers for the most common publishing systems">Tools &#8250; Import</a></li> 
+	</ul> 
+	
+	<p>Other external links of interest may include:</p>
+	<ul>
+		<li>Find answers to your questions at the <a href="http://www.wordpress.org/support/" title="The official WordPress forum">WordPress Forums</a></li>
+		<li>Learn more about WordPress at the <a href="http://codex.wordpress.org/" title="WordPress Codex">WordPress Codex</a></li>
+	</ul>
+	
+	<p>Happy publishing!</p>'),get_bloginfo('wpurl')); ?>
+	    </div>
+	    <div id="privacy" class="tabdiv"><p>
+	    <?php _e('
+	    WordPress makes requests to <span style="font-style: italic">api.wordpress.org</span> to check for software updates to WordPress core and plugins. Your WordPress and plugin versions are sent to check for the latest updates for your software. No personally-identifying information will be disclosed but non-personally identifying information may be used for aggregate statistics (e.g. tracking popular plugins).
+	    
+	    The service at WordPress.com, a popular WordPress host independent of this installation, available using a <a href="http://en.wordpress.com/api-keys/" title="API keys">WordPress.com API Key</a> is an independent service from your WordPress install and can optionally be used to activate WordPress.com plugins such as the Akismet spam filter.  
+	     '); ?></p>
+	    </div>
+	    <div id="info" class="tabdiv">
+	    <p><strong><?php _e('Server Information'); ?></strong></p>
+		<table class="sinfo">
+			<tr>
+				<th><?php _e('Product'); ?></th>
+				<th><?php _e('Version'); ?></th>
+			</tr>
+			<tr>
+				<td><a href="http://www.wordpress.org/">WordPress</a></td>
+				<td><?php echo $GLOBALS['wp_version']; ?></td>
+			</tr>
+			<tr>
+				<td><a href="http://www.mysql.com/">MySQL</a></td>
+				<td><?php echo mysql_get_server_info(); ?></td>
+			</tr>
+			<tr>
+				<td><a href="http://www.php.net/">PHP</a></td>
+				<td><?php echo phpversion(); ?></td>
+			</tr>
+			<tr>
+				<td><?php if(function_exists('apache_get_modules')) { echo '<a href="http://httpd.apache.org/">Apache</a>'; } else if(function_exists('iis_start_server')) { echo '<a href="http://www.iis.net/">IIS</a>'; } ?></td>
+				<td><?php if(function_exists('apache_get_modules')) { echo apache_get_version(); } else if(function_exists('iis_start_server')) { $s = explode('/',$_SERVER['SERVER_SOFTWARE']); echo $s[1]; } ?></td>
+			</tr>
+			<tr>
+				<td colspan="2" style="text-align: left;"><p><strong><?php _e('Important Directives'); ?></strong></p></td>
+			</tr>
+			<tr>
+				<th><?php _e('Directive'); ?></th>
+				<th><?php _e('Status'); ?></th>
+			</tr>
+			<tr>
+				<td><a href="http://www.php.net/manual/en/features.safe-mode.php"><?php echo _('Safe Mode'); ?></a></td>
+				<td><?php echo ((ini_get('safe_mode')) ? '<span style="color: red">' . __('On') . '</span>' : _('Off')); ?></td>
+			</tr>
+			<tr>
+				<td><a href="http://www.php.net/magic_quotes"><?php echo _('Magic Quotes'); ?></a></td>
+				<td><?php echo (get_magic_quotes_gpc() ? '<span style="color: red">' . __('On') . '</span>' : _('Off')); ?></td>
+			</tr>
+			<tr>
+				<td><a href="http://www.php.net/register_globals"><?php echo _('Register Globals'); ?></a></td>
+				<td><?php echo (ini_get('register_globals') ? '<span style="color: red">' . __('On') . '</span>' : __('Off')); ?></td>
+			</tr>
+			<?php if(function_exists('apache_get_modules')) { ?>
+			<tr>
+				<td><a href="http://httpd.apache.org/docs/current/mod/mod_rewrite.html">mod_rewrite</a></td>
+				<td><?php (in_array('mod_rewrite',apache_get_modules()) ? _e('Available') : _e('Unavailable')); ?></td>
+			</tr>
+			<tr>
+				<td><a href="http://httpd.apache.org/docs/current/mod/mod_deflate.html">mod_deflate</a></td>
+				<td><?php (in_array('mod_deflate',apache_get_modules()) ? _e('Available') : _e('Unavailable')); ?></td>
+			</tr>
+			<tr>
+				<td><a href="http://httpd.apache.org/docs/current/mod/mod_proxy.html">mod_proxy</a></td>
+				<td><?php (in_array('mod_proxy',apache_get_modules()) ? _e('Available') : _e('Unavailable')); ?></td>
+			</tr>
+			<?php } ?>
+		</table>
+	    </div>
+    	<?php foreach($additional_tabs as $key => $value) {
+				echo '<div id="' . sanitize_key($key) . "\" class=\"tabdiv\">$value</a></div>";
+		}; ?>
+    </div>
+</div>
+</div>
+<?php } ?>
 <?php if ( $show_screen ) : ?>
 <div id="screen-options-wrap" class="hidden">
 	<form id="adv-settings" action="" method="post">
@@ -1821,6 +1929,11 @@
 	</div>
 
 <div id="screen-meta-links">
+<?php if ( current_user_can('activate_plugins') && strpos($_SERVER['SCRIPT_FILENAME'],'index.php') !== false ) { ?>
+<div id="welcome-screen-link-wrap" class="hide-if-no-js screen-meta-toggle">
+<a href="#welcome-screen" id="welcome-screen-link" class="show-settings"><?php _e('Welcome Screen') ?></a>
+</div>
+<?php } ?>
 <div id="contextual-help-link-wrap" class="hide-if-no-js screen-meta-toggle">
 <a href="#contextual-help" id="contextual-help-link" class="show-settings"><?php _e('Help') ?></a>
 </div>
Index: wp-admin/js/common.dev.js
===================================================================
--- wp-admin/js/common.dev.js	(revision 18633)
+++ wp-admin/js/common.dev.js	(working copy)
@@ -183,6 +183,7 @@
 
 screenMeta = {
 	links: {
+		'welcome-screen-link-wrap': 'welcome-screen-wrap',
 		'screen-options-link-wrap': 'screen-options-wrap',
 		'contextual-help-link-wrap': 'contextual-help-wrap'
 	},
Index: wp-admin/index.php
===================================================================
--- wp-admin/index.php	(revision 18633)
+++ wp-admin/index.php	(working copy)
@@ -17,6 +17,9 @@
 wp_enqueue_script( 'dashboard' );
 wp_enqueue_script( 'plugin-install' );
 wp_enqueue_script( 'media-upload' );
+wp_enqueue_script( 'jquery' );
+wp_enqueue_script( 'jquery-ui-core' );
+wp_enqueue_script( 'jquery-ui-tabs' );
 add_thickbox();
 
 $title = __('Dashboard');
@@ -27,6 +30,37 @@
 else
 	add_screen_option('layout_columns', array('max' => 4, 'default' => 2) );
 
+function admin_index_addwelcome() {
+	echo '
+	<style>	
+		.tabnav li {
+			display: inline;
+		}
+		.sinfo {
+			width: 40%
+		}
+		.sinfo td {
+			text-align: center;
+			padding: 2px;
+		}
+	</style>';
+	echo '<script type="text/javascript">jQuery.noConflict(); jQuery(document).ready(function() {
+	';
+	if(array_key_exists('welcome',$_GET)) {
+		echo '
+		jQuery("#screen-options-link-wrap").css("visibility", "hidden");
+		jQuery("#contextual-help-link-wrap").css("visibility", "hidden");
+		jQuery("#welcome-screen-wrap").slideToggle("slow");
+		';
+	}
+	echo '
+	jQuery("#welcometabs").tabs();
+	});
+	</script>';
+ };
+
+add_action('admin_head', 'admin_index_addwelcome');
+
 add_contextual_help($current_screen,
 
 	'<p>' . __( 'Welcome to your WordPress Dashboard! You will find helpful tips in the Help tab of each screen to assist you as you get to know the application.' ) . '</p>' .
Index: wp-admin/css/wp-admin-rtl.dev.css
===================================================================
--- wp-admin/css/wp-admin-rtl.dev.css	(revision 18633)
+++ wp-admin/css/wp-admin-rtl.dev.css	(working copy)
@@ -383,6 +383,7 @@
 	visibility: hidden;
 }
 
+#welcome-screen-link-wrap,
 #screen-options-link-wrap,
 #contextual-help-link-wrap {
 	float: left;
Index: wp-admin/css/wp-admin.dev.css
===================================================================
--- wp-admin/css/wp-admin.dev.css	(revision 18633)
+++ wp-admin/css/wp-admin.dev.css	(working copy)
@@ -1590,6 +1590,7 @@
 	visibility: hidden;
 }
 
+#welcome-screen-link-wrap,
 #screen-options-link-wrap,
 #contextual-help-link-wrap {
 	float: right;
@@ -1605,6 +1606,7 @@
 	border-bottom-right-radius: 3px;
 }
 
+#welcome-screen-wrap li,
 #contextual-help-wrap li {
 	list-style-type: disc;
 	margin-left: 18px;
Index: wp-admin/css/colors-classic.dev.css
===================================================================
--- wp-admin/css/colors-classic.dev.css	(revision 18633)
+++ wp-admin/css/colors-classic.dev.css	(working copy)
@@ -1644,12 +1644,14 @@
 	color: #D54E21;
 }
 
+#welcome-screen-wrap,
 #screen-options-wrap,
 #contextual-help-wrap {
 	background-color: #f7fcfe;
 	border-color: #D1e5ee;
 }
 
+#welcome-screen-link-wrap,
 #screen-options-link-wrap,
 #contextual-help-link-wrap {
 	background-color: #eff8ff; /* Fallback */
Index: wp-admin/css/colors-fresh.dev.css
===================================================================
--- wp-admin/css/colors-fresh.dev.css	(revision 18633)
+++ wp-admin/css/colors-fresh.dev.css	(working copy)
@@ -1279,12 +1279,14 @@
 	color: #D54E21;
 }
 
+#welcome-screen-wrap,
 #screen-options-wrap,
 #contextual-help-wrap {
 	background-color: #f1f1f1;
 	border-color: #dfdfdf;
 }
 
+#welcome-screen-link-wrap,
 #screen-options-link-wrap,
 #contextual-help-link-wrap {
 	background-color: #e3e3e3; /* Fallback */
Index: wp-admin/update-core.php
===================================================================
--- wp-admin/update-core.php	(revision 18633)
+++ wp-admin/update-core.php	(working copy)
@@ -362,7 +362,7 @@
 			show_message( __('Installation Failed') );
 	} else {
 		show_message( __('WordPress updated successfully') );
-		show_message( '<a href="' . esc_url( self_admin_url() ) . '">' . __('Go to Dashboard') . '</a>' );
+		show_message( '<a href="' . esc_url( self_admin_url('index.php?welcome=1') ) . '">' . __('Go to Dashboard') . '</a>' );
 	}
 	echo '</div>';
 }