Index: wp-admin/admin-footer.php
===================================================================
--- wp-admin/admin-footer.php	(revision 31525)
+++ 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 31525)
+++ 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 31525)
+++ wp-admin/menu-header.php	(working copy)
@@ -220,8 +220,9 @@
 ?>
 
 <div id="adminmenuback"></div>
-<div id="adminmenuwrap">
-<ul id="adminmenu" role="navigation">
+<div id="adminmenuwrap" role="navigation">
+<a tabindex="1" href="#wpbody-content" class="screen-reader-shortcut"><?php _e('Skip to main content'); ?></a>
+<ul id="adminmenu">
 
 <?php