diff --git a/css/print.css b/css/print.css
index 3745ce6..1145ba9 100644
--- a/css/print.css
+++ b/css/print.css
@@ -13,7 +13,7 @@
     padding: 10pt;
     border: 0;
 }
-#hd {
+header {
     margin-top: 0;
 }
 
@@ -43,12 +43,12 @@
     page-break-inside: avoid;
 }
 
-#bd,
+article,
 #about {
     margin-bottom: 0;
 }
 
-#ft {
+footer {
     padding: 5pt 0;
 }
 
@@ -62,14 +62,14 @@ body {
     font-size: 10pt;
 }
 
-#hd h1 {
+header h1 {
     font-size: 28pt;
 }
-#hd h2 {
+header h2 {
     font-size: 14pt;
 }
 
-#bd h2,
+article h2,
 #profile .enlarge,
 #about .enlarge {
     font-size: 12pt;
@@ -121,4 +121,4 @@ a {
     visibility: hidden;
 }
 
-/* --------- */
\ No newline at end of file
+/* --------- */
diff --git a/css/resume.css b/css/resume.css
index 30de4c0..33a775e 100644
--- a/css/resume.css
+++ b/css/resume.css
@@ -52,34 +52,34 @@ body {
 
 /* //-- header, body, footer -- */
 
-#hd {
+header {
   margin: 2.5em 0 3em 0;
   padding-bottom: 1.5em;
   border-bottom: 1px solid #ccc;
 }
- 
-#hd h1 {
+
+header h1 {
   font-size: 48px;
   text-transform: uppercase;
   letter-spacing: 3px;
 }
 
-#hd h2 {
+header h2 {
   text-transform: uppercase;
   letter-spacing: 2px;
 }
 
-#bd,
-#ft {  margin-bottom: 2em }
+article,
+footer {  margin-bottom: 2em }
 
-#ft p {
+footer p {
   margin-bottom: 0;
   text-align: center;
 }
 
 /* //-- footer -- */
 
-#ft {
+footer {
   padding: 1em 0 5em 0;
   font-size: 92%;
   border-top: 1px solid #ccc;
@@ -188,9 +188,9 @@ p.enlarge {
 }
 
 .org p,
-.job p {  
+.job p {
   margin: 0.75em 0 3em 0;
-  font-size: 122%; 
+  font-size: 122%;
 }
 
 .last {  border: none }
@@ -287,21 +287,21 @@ noscript {
 
 @media screen and (max-width: 59.9em) {
   #inner {
-    padding: 5 5 5 5; 
+    padding: 5 5 5 5;
     margin: 0 auto;
     background: #f5f5f5;
     border: solid #666;
     border-width: 8px 0 2px 0;
-    box-shadow: 0 1px 3px #000;  
-  } 
-  #hd h1 {
+    box-shadow: 0 1px 3px #000;
+  }
+  header h1 {
     font-size: 2.2em;
     font-weight: bold;
     text-transform: uppercase;
     letter-spacing: 0.2em;
   }
 
-  #hd h2 {
+  header h2 {
     font-size: 1.5em;
     text-transform: uppercase;
     letter-spacing: 0.2em;
@@ -359,4 +359,4 @@ noscript {
     border-width: 8px 0 2px 0;
     box-shadow: 0 1px 3px #000;
   }
-}
\ No newline at end of file
+}
diff --git a/index.html b/index.html
index 253b0c4..e7506a4 100644
--- a/index.html
+++ b/index.html
@@ -1,8 +1,11 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!DOCTYPE html>
+<html lang="en">
 <head>
   <title>GitHub R&eacute;sum&eacute;</title>
-  <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+  <meta charset="utf-8" />
+  <!--[if IE]>
+    <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+  <![endif]-->
   <meta name="keywords" content="cv, resume, hResume, github, community, free, fun, nice, useful" />
   <meta name="description" content="GitHub resumes, generated by the community, for the community." />
   <link rel="stylesheet" type="text/css" href="https://yui-s.yahooapis.com/2.7.0/build/reset-fonts-grids/reset-fonts-grids.css" media="all" />
diff --git a/views/api_limit.html b/views/api_limit.html
index 7d0821e..8583f88 100644
--- a/views/api_limit.html
+++ b/views/api_limit.html
@@ -1,10 +1,10 @@
 <div id="doc" class="yui-t7">
-   <div id="hd" role="banner"><h1>API Limit Reached</h1></div>
-   <div id="bd" role="main">
+  <header role="banner"><h1>API Limit Reached</h1></header>
+  <article role="main">
     <div class="yui-g">
         <p>The API rate limit has been exceeded for your IP address. Please try again later.</p>
     </div>
-   </div>
+  </article>
 
-   <div id="ft" role="contentinfo"></div>
+  <footer role="contentinfo"></footer>
 </div>
diff --git a/views/error.html b/views/error.html
index 2cf2520..c197e8d 100644
--- a/views/error.html
+++ b/views/error.html
@@ -1,12 +1,11 @@
 <div id="doc" class="yui-t7">
-   <div id="hd" role="banner"><h1>Uh oh :(</h1></div>
-   <div id="bd" role="main">
+  <header role="banner"><h1>Uh oh :(</h1></header>
+  <article role="main">
     <div class="yui-g">
-        <p>
-           There was an issue accessing the requested profile to auto-generate this r&eacute;sum&eacute;. <a href="https://github.com/{{username}}" title="GitHub profile of {{username}}">Access the user's profile directly.</a>
-        </p>
+      <p>
+        There was an issue accessing the requested profile to auto-generate this r&eacute;sum&eacute;. <a href="https://github.com/{{username}}" title="GitHub profile of {{username}}">Access the user's profile directly.</a>
+      </p>
     </div>
-
-    </div>
-   <div id="ft" role="contentinfo"><p>Brought to you by the brilliant mind of <a href="https://twitter.com/davidcoallier">@davidcoallier</a> &lt;/modesty&gt; &mdash; Resume Template from <a href="http://thingsthatarebrown.com/blog/2009/05/sample-resume-template/">Things That Are Brown</a></p></div>
+  </article>
+  <footer role="contentinfo"><p>Brought to you by the brilliant mind of <a href="https://twitter.com/davidcoallier">@davidcoallier</a> &lt;/modesty&gt; &mdash; Resume Template from <a href="http://thingsthatarebrown.com/blog/2009/05/sample-resume-template/">Things That Are Brown</a></p></footer>
 </div>
diff --git a/views/index.html b/views/index.html
index e9a9d30..806a3a2 100644
--- a/views/index.html
+++ b/views/index.html
@@ -1,6 +1,6 @@
 <div id="doc" class="yui-t7">
-  <div id="hd" role="banner"><h1>My GitHub R&eacute;sum&eacute;</h1></div>
-  <div id="bd" role="main">
+  <header role="banner"><h1>My GitHub R&eacute;sum&eacute;</h1></header>
+  <article role="main">
     <div class="yui-g">
       <p class="enlarge-medium">
         As a software startup owner I really enjoy when people send us their
@@ -59,9 +59,9 @@
         </p>
       </div>
     </div>
+  </article>
 
-    <div id="ft" role="contentinfo"><p>Brought to you by the brilliant mind of <a href="https://twitter.com/davidcoallier">@davidcoallier</a> &lt;/modesty&gt; &mdash; R&eacute;sum&eacute; Template from <a href="http://thingsthatarebrown.com/blog/2009/05/sample-resume-template/">Things That Are Brown</a></p></div>
-  </div>
+  <footer role="contentinfo"><p>Brought to you by the brilliant mind of <a href="https://twitter.com/davidcoallier">@davidcoallier</a> &lt;/modesty&gt; &mdash; R&eacute;sum&eacute; Template from <a href="http://thingsthatarebrown.com/blog/2009/05/sample-resume-template/">Things That Are Brown</a></p></footer>
 </div>
 
 <script type="text/javascript">
diff --git a/views/job.html b/views/job.html
index 48087af..4515bba 100644
--- a/views/job.html
+++ b/views/job.html
@@ -7,9 +7,9 @@
   <p>{{description}}</p>
   <p>
     This repository has {{watchers}} {{watchersLabel}} and {{forks}} {{forksLabel}}.
-    If you would like more information about this repository and my 
-    contributed code, please visit 
-    <a href="https://github.com/{{username}}/{{name}}">the repo</a> on 
+    If you would like more information about this repository and my
+    contributed code, please visit
+    <a href="https://github.com/{{username}}/{{name}}">the repo</a> on
     GitHub.
   </p>
 </div>
diff --git a/views/not_found.html b/views/not_found.html
index 68d2a21..8a70def 100644
--- a/views/not_found.html
+++ b/views/not_found.html
@@ -1,10 +1,10 @@
 <div id="doc" class="yui-t7">
-   <div id="hd" role="banner"><h1>User Not Found</h1></div>
-   <div id="bd" role="main">
+  <header role="banner"><h1>User Not Found</h1></header>
+  <article role="main">
     <div class="yui-g">
-        <p>The user you requested was not found. Please check your spelling and try again.</p>
+      <p>The user you requested was not found. Please check your spelling and try again.</p>
     </div>
-   </div>
+  </article>
 
-   <div id="ft" role="contentinfo"></div>
+  <footer role="contentinfo"></footer>
 </div>
diff --git a/views/opt_out.html b/views/opt_out.html
index 0b8da3f..691836e 100644
--- a/views/opt_out.html
+++ b/views/opt_out.html
@@ -1,12 +1,12 @@
 <div id="doc" class="yui-t7">
-   <div id="hd" role="banner"><h1>This user hasn't opted in</h1></div>
-   <div id="bd" role="main">
+  <header role="banner"><h1>This user hasn't opted in</h1></header>
+  <article role="main">
     <div class="yui-g">
       <p>This user has <strong>not</strong> opted in to this unofficial GitHub résumé service.</p>
       <br />
       <p>If you would like to opt-in, simply go to our <a href="https://github.com/resume/resume.github.com">GitHub Project</a> page and <strong>star</strong> the project.</p>
     </div>
-   </div>
+  </article>
 
-   <div id="ft" role="contentinfo"></div>
+  <footer role="contentinfo"></footer>
 </div>
diff --git a/views/resume.html b/views/resume.html
index 0a4a0f4..f7ca1c1 100644
--- a/views/resume.html
+++ b/views/resume.html
@@ -7,7 +7,7 @@
 
   <div id="inner" class="vcard">
 
-    <div id="hd">
+    <header>
       <div class="yui-gc">
         <div class="yui-u first">
           <h1 class="fn">{{name}}</h1>
@@ -23,9 +23,9 @@
           </div><!--// .contact-info -->
         </div>
       </div><!--// .yui-gc -->
-    </div><!--// hd -->
+    </header>
 
-    <div id="bd">
+    <article>
       <div id="yui-main">
         <div class="yui-b">
 
@@ -96,11 +96,11 @@
           </div><!--// .yui-gf -->
         </div><!--// .yui-b -->
       </div><!--// yui-main -->
-    </div><!--// bd -->
+    </article>
 
-    <div id="ft">
+    <footer>
       <p>{{name}} &mdash; {{#email}}<a href="mailto:{{email}}">{{email}}</a> &mdash; {{/email}} {{#website}}<a href="{{website}}" title="{{name}}'s website">{{website}}</a> &mdash; {{/website}} <a href="https://github.com/{{username}}" title="GitHub profile" class="url">https://github.com/{{username}}</a></p>
-    </div><!--// footer -->
+    </footer>
 
   </div><!-- // inner -->
 
diff --git a/views/resumeOrgs.html b/views/resumeOrgs.html
index 2f40deb..70aade6 100644
--- a/views/resumeOrgs.html
+++ b/views/resumeOrgs.html
@@ -1,7 +1,7 @@
 <div id="doc2" class="yui-t7">
   <div id="inner">
 
-    <div id="hd">
+    <header>
       <div class="yui-gc">
         <div class="yui-u first">
           <hgroup>
@@ -19,9 +19,9 @@
           </div><!--// .contact-info -->
         </div>
       </div><!--// .yui-gc -->
-    </div><!--// hd -->
+    </header>
 
-    <div id="bd">
+    <article>
       <div id="yui-main">
         <div class="yui-b">
 
@@ -31,11 +31,11 @@
             </div>
             <div class="yui-u">
               <p class="enlarge">
-                 We are a group of developers 
+                 We are a group of developers
                  {{#location}}
                  based in {{location}}
                  {{/location}}
-                 {{#repos}} 
+                 {{#repos}}
                  with <a href="https://github.com/{{{username}}}?tab=repositories">{{repos}} public {{reposLabel}}</a>
                  {{/repos}}
                  {{#followers}}&nbsp;and <a href="https://github.com/{{{username}}}/followers">{{followers}} {{followersLabel}}</a>{{/followers}}.
@@ -44,7 +44,7 @@
               <p id="languages" class="enlarge"></p>
             </div>
           </div><!--// .yui-gf -->
-          <div class="yui-gf" id="mylanguages"> 
+          <div class="yui-gf" id="mylanguages">
               <div class="yui-u first">
                   <h2>Languages</h2>
               </div>
@@ -77,11 +77,11 @@
           </div><!--// .yui-gf -->
         </div><!--// .yui-b -->
       </div><!--// yui-main -->
-    </div><!--// bd -->
+    </article>
 
-    <div id="ft">
+    <footer>
       <p>{{name}} &mdash; {{#email}}<a href="mailto:{{email}}">{{email}}</a> &mdash; {{/email}} <a href="https://github.com/{{username}}" title="Github profile">https://github.com/{{username}}</a></p>
-    </div><!--// footer -->
+    </footer>
 
   </div><!-- // inner -->
 
