Index: wp-admin/admin-footer.php
===================================================================
--- wp-admin/admin-footer.php	(revision 31537)
+++ wp-admin/admin-footer.php	(working copy)
@@ -15,7 +15,7 @@
 <div class="clear"></div></div><!-- wpbody -->
 <div class="clear"></div></div><!-- wpcontent -->
 
-<div id="wpfooter">
+<div id="wpfooter" role="contentinfo">
 	<?php
 	/**
 	 * Fires after the opening tag for the admin footer.
Index: wp-admin/admin-header.php
===================================================================
--- wp-admin/admin-header.php	(revision 31537)
+++ wp-admin/admin-header.php	(working copy)
@@ -190,9 +190,8 @@
 ?>
 
 <div id="wpwrap">
-<a tabindex="1" href="#wpbody-content" class="screen-reader-shortcut"><?php _e('Skip to main content'); ?></a>
 <?php require(ABSPATH . 'wp-admin/menu-header.php'); ?>
-<div id="wpcontent">
+<div id="wpcontent" role="main">
 
 <?php
 /**
Index: wp-admin/menu-header.php
===================================================================
--- wp-admin/menu-header.php	(revision 31537)
+++ wp-admin/menu-header.php	(working copy)
@@ -218,10 +218,14 @@
 }
 
 ?>
-
+<div id="adminmenumain" role="navigation" aria-label="<?php esc_attr_e( 'Main menu' ); ?>">
+<a href="#wpbody-content" class="screen-reader-shortcut"><?php _e( 'Skip to main content' ); ?></a>
+<?php if ( is_admin() ) { ?>
+	<a href="#wp-toolbar" class="screen-reader-shortcut"><?php _e('Skip to toolbar'); ?></a>
+<?php } ?>
 <div id="adminmenuback"></div>
-<div id="adminmenuwrap">
-<ul id="adminmenu" role="navigation">
+<div id="adminmenuwrap" role="navigation">
+<ul id="adminmenu">
 
 <?php
 
@@ -236,3 +240,4 @@
 ?>
 </ul>
 </div>
+</div>
\ No newline at end of file
Index: wp-includes/class-wp-admin-bar.php
===================================================================
--- wp-includes/class-wp-admin-bar.php	(revision 31537)
+++ wp-includes/class-wp-admin-bar.php	(working copy)
@@ -364,7 +364,9 @@
 
 		?>
 		<div id="wpadminbar" class="<?php echo $class; ?>" role="navigation">
-			<a class="screen-reader-shortcut" href="#wp-toolbar" tabindex="1"><?php _e('Skip to toolbar'); ?></a>
+			<?php if ( !is_admin() ) { ?>
+				<a class="screen-reader-shortcut" href="#wp-toolbar" tabindex="1"><?php _e('Skip to toolbar'); ?></a>
+			<?php } ?>
 			<div class="quicklinks" id="wp-toolbar" role="navigation" aria-label="<?php esc_attr_e('Top navigation toolbar.'); ?>" tabindex="0">
 				<?php foreach ( $root->children as $group ) {
 					$this->_render_group( $group );