--- a/master/definitions.xml	Sun Jan 20 12:24:29 2013 +1100
+++ b/master/definitions.xml	Sat Jan 19 12:10:01 2013 -0600
@@ -15,7 +15,7 @@
       contentmodel='textoranyof'
       elementcategories='animation, descriptive, shape, structural, gradient'
       elements='a, clipPath, color-profile, cursor, filter, font, font-face, foreignObject, image, marker, mask, pattern, script, style, switch, view, text, altGlyphDef'
-      attributecategories='conditional processing, core, graphical event, presentation, style, xlink'
+      attributecategories='aria, conditional processing, core, graphical event, presentation, style, xlink'
       interfaces='SVGAElement'>
     <attribute name='xlink:href' href='linking.html#AElementXLinkHrefAttribute' animatable='yes'/>
     <attribute name='xlink:show' href='linking.html#XLinkShowAttribute'/>
@@ -27,7 +27,7 @@
       name='altGlyph'
       href='text.html#AltGlyphElement'
       contentmodel='any'
-      attributecategories='conditional processing, core, graphical event, presentation, style, xlink'
+      attributecategories='aria, conditional processing, core, graphical event, presentation, style, xlink'
       interfaces='SVGAltGlyphElement'>
     <attribute name='x' href='text.html#AltGlyphElementXAttribute' animatable='yes'/>
     <attribute name='y' href='text.html#AltGlyphElementYAttribute' animatable='yes'/>
@@ -56,7 +56,7 @@
   <element
       name='altGlyphItem'
       href='text.html#AltGlyphItemElement'
-      attributecategories='core'
+      attributecategories='aria, core'
       interfaces='SVGAltGlyphItemElement'>
     <x:contentmodel xmlns='http://www.w3.org/1999/xhtml'>
       One or more <a>'glyphRef'</a> elements.
@@ -70,15 +70,13 @@
     elementcategories='descriptive'
     attributecategories='conditional processing, core, animation event, xlink, animation attribute target, animation timing, animation value, animation addition, presentation'
     interfaces='SVGAnimateElement'/>
-
   <element
     name='animateColor'
     href='animate.html#AnimateColorElement'
     contentmodel='anyof'
     elementcategories='descriptive'
-    attributecategories='conditional processing, core, animation event, xlink, animation attribute target, animation timing, animation value, animation addition, presentation'
+    attributecategories='conditional processing, core, animation event, xlink, animation attribute target, animation timing, animation value, animation addition, presentation, aria'
     interfaces='SVGAnimateColorElement'/>
-
   <element
       name='animateMotion'
       href='animate.html#AnimateMotionElement'
@@ -93,7 +91,6 @@
     <attribute name='rotate' href='animate.html#RotateAttribute'/>
     <attribute name='origin' href='animate.html#OriginAttribute'/>
   </element>
-
   <element
       name='animateTransform'
       href='animate.html#AnimateTransformElement'
@@ -110,7 +107,7 @@
       contentmodel='anyof'
       elementcategories='animation, descriptive'
       elements='mask'
-      attributecategories='conditional processing, core, graphical event, presentation, style'
+      attributecategories='aria, conditional processing, core, graphical event, presentation, style'
       interfaces='SVGCircleElement'>
     <attribute name='cx' href='shapes.html#CircleElementCXAttribute' animatable='yes'/>
     <attribute name='cy' href='shapes.html#CircleElementCYAttribute' animatable='yes'/>
@@ -146,7 +143,7 @@
       href='interact.html#CursorElement'
       contentmodel='anyof'
       elementcategories='descriptive'
-      attributecategories='core, xlink'
+      attributecategories='aria, core, xlink'
       interfaces='SVGCursorElement'>
     <attribute name='x' href='interact.html#CursorElementXAttribute' animatable='yes'/>
     <attribute name='y' href='interact.html#CursorElementYAttribute' animatable='yes'/>
@@ -161,7 +158,6 @@
     elements='a, clipPath, color-profile, cursor, filter, font, font-face, foreignObject, image, marker, mask, pattern, script, style, switch, view, text, altGlyphDef'
     attributecategories='core, graphical event, presentation, style'
     interfaces='SVGDefsElement'/>
-
   <element
     name='desc'
     href='struct.html#DescElement'
@@ -169,13 +165,12 @@
     attributecategories='core, style'
     attributes='lang'
     interfaces='SVGDescElement'/>
-
   <element
     name='discard'
     href='struct.html#DiscardElement'
     contentmodel='anyof'
     elementcategories='descriptive'
-    attributecategories='conditional processing, core'
+    attributecategories='conditional processing, core, aria'
     interfaces='SVGDiscardElement'>
     <attribute name='begin' href='struct.html#DiscardElementBeginAttribute' animatable='no'/>
     <attribute name='href' href='struct.html#DiscardElementHrefAttribute' animatable='no'/>
@@ -187,7 +182,7 @@
       contentmodel='anyof'
       elementcategories='animation, descriptive'
       elements='mask'
-      attributecategories='conditional processing, core, graphical event, presentation, style'
+      attributecategories='aria, conditional processing, core, graphical event, presentation, style' 
       interfaces='SVGEllipseElement'>
     <attribute name='cx' href='shapes.html#EllipseElementCXAttribute' animatable='yes'/>
     <attribute name='cy' href='shapes.html#EllipseElementCYAttribute' animatable='yes'/>
@@ -290,7 +285,7 @@
       name='foreignObject'
       href='extend.html#ForeignObjectElement'
       contentmodel='any'
-      attributecategories='core, conditional processing, graphical event, presentation, style'
+      attributecategories='aria, core, conditional processing, graphical event, presentation, style'
       interfaces='SVGForeignObjectElement'>
     <attribute name='x' href='extend.html#ForeignObjectElementXAttribute' animatable='yes'/>
     <attribute name='y' href='extend.html#ForeignObjectElementYAttribute' animatable='yes'/>
@@ -304,7 +299,7 @@
     contentmodel='anyof'
     elementcategories='animation, descriptive, shape, structural, gradient'
     elements='a, clipPath, color-profile, cursor, filter, font, font-face, foreignObject, image, marker, mask, pattern, script, style, switch, view, text, altGlyphDef'
-    attributecategories='conditional processing, core, graphical event, presentation, style'
+    attributecategories='aria, conditional processing, core, graphical event, presentation, style'
     interfaces='SVGGElement'/>
 
   <element
@@ -340,7 +335,7 @@
   <element
     name='hkern'
     href='fonts.html#HKernElement'
-    attributecategories='core'
+    attributecategories='aria, core'
     attributes='u1, g1, u2, g2, k'
     interfaces='SVGHKernElement'/>
 
@@ -350,7 +345,7 @@
       contentmodel='anyof'
       elementcategories='animation, descriptive'
       elements='mask'
-      attributecategories='core, conditional processing, graphical event, style, xlink, presentation'
+      attributecategories='aria, core, conditional processing, graphical event, style, xlink, presentation'
       attributes='preserveAspectRatio'
       interfaces='SVGImageElement'>
     <attribute name='x' href='struct.html#ImageElementXAttribute' animatable='yes'/>
@@ -366,7 +361,7 @@
       contentmodel='anyof'
       elementcategories='animation, descriptive'
       elements='mask'
-      attributecategories='conditional processing, core, graphical event, presentation, style'
+      attributecategories='aria, conditional processing, core, graphical event, presentation, style'
       interfaces='SVGLineElement'>
     <attribute name='x1' href='shapes.html#LineElementX1Attribute' animatable='yes'/>
     <attribute name='y1' href='shapes.html#LineElementY1Attribute' animatable='yes'/>
@@ -496,7 +491,7 @@
       contentmodel='anyof'
       elementcategories='animation, descriptive'
       elements='mask'
-      attributecategories='conditional processing, core, graphical event, presentation, style'
+      attributecategories='aria, conditional processing, core, graphical event, presentation, style'
       interfaces='SVGPathElement'>
     <attribute name='d' href='paths.html#DAttribute' animatable='yes'/>
     <attribute name='pathLength' href='paths.html#PathLengthAttribute' animatable='yes'/>
@@ -527,7 +522,7 @@
       contentmodel='anyof'
       elementcategories='animation, descriptive'
       elements='mask'
-      attributecategories='conditional processing, core, graphical event, presentation, style'
+      attributecategories='aria, conditional processing, core, graphical event, presentation, style'
       interfaces='SVGPolygonElement'>
     <attribute name='points' href='shapes.html#PolygonElementPointsAttribute' animatable='yes'/>
   </element>
@@ -538,7 +533,7 @@
       contentmodel='anyof'
       elementcategories='animation, descriptive'
       elements='mask'
-      attributecategories='conditional processing, core, graphical event, presentation, style'
+      attributecategories='aria, conditional processing, core, graphical event, presentation, style'
       interfaces='SVGPolylineElement'>
     <attribute name='points' href='shapes.html#PolylineElementPointsAttribute' animatable='yes'/>
   </element>
@@ -569,7 +564,7 @@
       contentmodel='anyof'
       elementcategories='animation, descriptive'
       elements='mask'
-      attributecategories='conditional processing, core, graphical event, presentation, style'
+      attributecategories='aria, conditional processing, core, graphical event, presentation, style'
       interfaces='SVGRectElement'>
     <attribute name='x' href='shapes.html#RectElementXAttribute' animatable='yes'/>
     <attribute name='y' href='shapes.html#RectElementYAttribute' animatable='yes'/>
@@ -636,7 +631,7 @@
       contentmodel='anyof'
       elementcategories='animation, descriptive, shape, structural, gradient'
       elements='a, clipPath, color-profile, cursor, filter, font, font-face, foreignObject, image, marker, mask, pattern, script, style, switch, view, text, altGlyphDef'
-      attributecategories='conditional processing, core, document event, graphical event, presentation, style'
+      attributecategories='aria, conditional processing, core, document event, graphical event, presentation, style'
       attributes='viewBox, preserveAspectRatio, zoomAndPan'
       interfaces='SVGSVGElement'>
     <attribute name='x' href='struct.html#SVGElementXAttribute' animatable='yes'/>
@@ -655,7 +650,7 @@
     contentmodel='anyof'
     elementcategories='animation, descriptive, shape'
     elements='svg, g, use, text, image, a, foreignObject, switch, mask'
-    attributecategories='conditional processing, core, graphical event, presentation, style'
+    attributecategories='aria, conditional processing, core, graphical event, presentation, style'
     interfaces='SVGSwitchElement'/>
 
   <element
@@ -664,7 +659,7 @@
     contentmodel='anyof'
     elementcategories='animation, descriptive, shape, structural, gradient'
     elements='a, clipPath, color-profile, cursor, filter, font, font-face, foreignObject, image, marker, mask, pattern, script, style, switch, view, text, altGlyphDef'
-    attributecategories='core, graphical event, presentation, style'
+    attributecategories='aria, core, graphical event, presentation, style'
     attributes='preserveAspectRatio, viewBox'
     interfaces='SVGSymbolElement'/>
 
@@ -674,7 +669,7 @@
       contentmodel='textoranyof'
       elementcategories='animation, descriptive, text content child'
       elements='a, mask'
-      attributecategories='conditional processing, core, graphical event, presentation, style'
+      attributecategories='aria, conditional processing, core, graphical event, presentation, style'
       attributes='lengthAdjust'
       interfaces='SVGTextElement'>
     <attribute name='x' href='text.html#TextElementXAttribute' animatable='yes'/>
@@ -692,7 +687,7 @@
       contentmodel='textoranyof'
       elementcategories='descriptive'
       elements='animate, animateColor, a, set, tspan, tref, altGlyph'
-      attributecategories='conditional processing, core, graphical event, presentation, style, xlink'
+      attributecategories='aria, conditional processing, core, graphical event, presentation, style, xlink'
       attributes='lengthAdjust, textLength'
       interfaces='SVGTextPathElement'>
     <attribute name='xlink:href' href='text.html#TextPathElementHrefAttribute' animatable='yes'/>
@@ -715,7 +710,7 @@
       contentmodel='anyof'
       elementcategories='descriptive'
       elements='animate, animateColor, set'
-      attributecategories='conditional processing, core, graphical event, presentation, style, xlink'
+      attributecategories='aria, conditional processing, core, graphical event, presentation, style, xlink'
       attributes='x, y, dx, dy, rotate, textLength, lengthAdjust'
       interfaces='SVGTRefElement'>
     <attribute name='xlink:href' elements='tref' href='text.html#TRefElementHrefAttribute' animatable='yes'/>
@@ -727,7 +722,7 @@
     contentmodel='textoranyof'
     elementcategories='descriptive'
     elements='a, animate, animateColor, set, tspan, tref, altGlyph'
-    attributecategories='conditional processing, core, graphical event, presentation, style'
+    attributecategories='aria, conditional processing, core, graphical event, presentation, style'
     attributes='x, y, dx, dy, rotate, textLength, lengthAdjust'
     interfaces='SVGTSpanElement'/>
 
@@ -737,7 +732,7 @@
       contentmodel='anyof'
       elementcategories='animation, descriptive'
       elements='mask'
-      attributecategories='core, conditional processing, graphical event, presentation, style, xlink'
+      attributecategories='aria, core, conditional processing, graphical event, presentation, style, xlink'
       interfaces='SVGUseElement'>
     <attribute name='x' href='struct.html#UseElementXAttribute' animatable='yes'/>
     <attribute name='y' href='struct.html#UseElementYAttribute' animatable='yes'/>
@@ -751,12 +746,11 @@
       href='linking.html#ViewElement'
       contentmodel='anyof'
       elementcategories='descriptive'
-      attributecategories='core'
+      attributecategories='aria, core'
       attributes='viewBox, preserveAspectRatio, zoomAndPan'
       interfaces='SVGViewElement'>
     <attribute name='viewTarget' elements='view' href='linking.html#ViewElementViewTargetAttribute'/>
   </element>
-
   <element
     name='vkern'
     href='fonts.html#VKernElement'
@@ -831,6 +825,46 @@
   <!-- ... attribute categories .......................................... -->
 
   <attributecategory
+      name='aria'
+      href='intro.html#TermARIAAttribute'>
+      <attribute name='aria-activedescendant' href='http://www.w3.org/TR/wai-aria/states_and_properties#aria-activedescendant'/>
+      <attribute name='aria-atomic' href='http://www.w3.org/TR/wai-aria/states_and_properties#aria-atomic'/>
+      <attribute name='aria-autocomplete' href='http://www.w3.org/TR/wai-aria/states_and_properties#aria-autocomplete'/>
+  <attribute name='aria-busy' href='http://www.w3.org/TR/wai-aria/states_and_properties#aria-busy'/>
+  <attribute name='aria-checked' href='http://www.w3.org/TR/wai-aria/states_and_properties#aria-checked'/>
+  <attribute name='aria-controls' href='http://www.w3.org/TR/wai-aria/states_and_properties#aria-controls'/>
+  <attribute name='aria-describedby' href='http://www.w3.org/TR/wai-aria/states_and_properties#aria-describedby'/>
+  <attribute name='aria-disabled' href='http://www.w3.org/TR/wai-aria/states_and_properties#aria-disabled'/>
+  <attribute name='aria-dropeffect' href='http://www.w3.org/TR/wai-aria/states_and_properties#aria-dropeffect'/>
+  <attribute name='aria-expanded' href='http://www.w3.org/TR/wai-aria/states_and_properties#aria-expanded'/>
+  <attribute name='aria-flowto' href='http://www.w3.org/TR/wai-aria/states_and_properties#aria-flowto'/>
+  <attribute name='aria-grabbed' href='http://www.w3.org/TR/wai-aria/states_and_properties#aria-grabbed'/>
+  <attribute name='aria-haspopup' href='http://www.w3.org/TR/wai-aria/states_and_properties#aria-haspopup'/>
+  <attribute name='aria-hidden' href='http://www.w3.org/TR/wai-aria/states_and_properties#aria-hidden'/>
+  <attribute name='aria-invalid' href='http://www.w3.org/TR/wai-aria/states_and_properties#aria-invalid'/>
+  <attribute name='aria-label' href='http://www.w3.org/TR/wai-aria/states_and_properties#aria-label'/>
+  <attribute name='aria-labelledby' href='http://www.w3.org/TR/wai-aria/states_and_properties#aria-labelledby'/>
+  <attribute name='aria-level' href='http://www.w3.org/TR/wai-aria/states_and_properties#aria-level'/>
+  <attribute name='aria-live' href='http://www.w3.org/TR/wai-aria/states_and_properties#aria-live'/>
+  <attribute name='aria-multiline' href='http://www.w3.org/TR/wai-aria/states_and_properties#aria-multiline'/>
+  <attribute name='aria-multiselectable' href='http://www.w3.org/TR/wai-aria/states_and_properties#aria-multiselectable'/>
+  <attribute name='aria-orientation' href='http://www.w3.org/TR/wai-aria/states_and_properties#aria-orientation'/>
+  <attribute name='aria-owns' href='http://www.w3.org/TR/wai-aria/states_and_properties#aria-owns'/>
+  <attribute name='aria-posinset' href='http://www.w3.org/TR/wai-aria/states_and_properties#aria-posinset'/>
+  <attribute name='aria-pressed' href='http://www.w3.org/TR/wai-aria/states_and_properties#aria-pressed'/>
+  <attribute name='aria-readonly' href='http://www.w3.org/TR/wai-aria/states_and_properties#aria-readonly'/>
+  <attribute name='aria-relevant' href='http://www.w3.org/TR/wai-aria/states_and_properties#aria-relevant'/>
+  <attribute name='aria-required' href='http://www.w3.org/TR/wai-aria/states_and_properties#aria-required'/>
+  <attribute name='aria-selected' href='http://www.w3.org/TR/wai-aria/states_and_properties#aria-selected'/>
+  <attribute name='aria-setsize' href='http://www.w3.org/TR/wai-aria/states_and_properties#aria-setsize'/>
+  <attribute name='aria-sort' href='http://www.w3.org/TR/wai-aria/states_and_properties#aria-sort'/>
+  <attribute name='aria-valuemax' href='http://www.w3.org/TR/wai-aria/states_and_properties#aria-valuemax'/>
+  <attribute name='aria-valuemin' href='http://www.w3.org/TR/wai-aria/states_and_properties#aria-valuemin'/>
+  <attribute name='aria-valuenow' href='http://www.w3.org/TR/wai-aria/states_and_properties#aria-valuenow'/>
+  <attribute name='aria-valuetext' href='http://www.w3.org/TR/wai-aria/states_and_properties#aria-valuetext'/>
+  <attribute name='role' href='struct.html#RoleAttribute'/>
+  </attributecategory>
+  <attributecategory
       name='conditional processing'
       href='intro.html#TermConditionalProcessingAttribute'>
     <attribute name='requiredFeatures' href='struct.html#RequiredFeaturesAttribute'/>

--- a/master/intro.html	Sun Jan 20 12:24:29 2013 +1100
+++ b/master/intro.html	Sat Jan 19 12:10:01 2013 -0600
@@ -246,6 +246,13 @@
   <a href="script.html#AnimationEvents">Animation event attributes</a>.
   The animation event attributes are <edit:attributecategory name='animation event'/>.</dd>
 
+  <dt id="TermARIAAttribute">WAI-ARIA attributes</dt>
+  <dd>These are the attributes used consisting of WAI-ARIA states and properties as well as 
+  the role attribute whose values are defined defined in WAI-ARIA. See WAI-ARIA 
+  <a href="http://www.w3.org/TR/wai-aria/roles#role_definitions">WAI-ARiA Definition of Roles</a> 
+ and WAI-ARIA <a href="http://www.w3.org/TR/wai-aria/states_and_properties">Supported States and Properties</a>.
+  The aria attributes are <edit:attributecategory name='aria'/>.</dd>
+
   <dt id="TermBasicShapeElement">basic shape</dt>
   <dt id="TermShapeElement">shape</dt>
   <dd>A graphics element that is defined by some combination of

--- a/master/struct.html	Sun Jan 20 12:24:29 2013 +1100
+++ b/master/struct.html	Sat Jan 19 12:10:01 2013 -0600
@@ -2059,6 +2059,30 @@
 non-abstract role found in the list of values generated when the role attribute
 is split on spaces.</p>
 
+   <dt>
+    <table class="propdef attrdef">
+      <tr>
+        <th>Name</th> 
+        <th>Value</th> 
+        <th>Lacuna value</th>
+        <th>Animatable</th>
+      </tr> 
+      <tr>
+        <td><dfn id="RoleAttribute">role</dfn></td>
+        <td>white-space space separated tokens having values defined in
+<a href="http://www.w3.org/TR/wai-aria/roles#role_definitions">Definition of Roles</a>
+([<a href="refs.html#ref-ARIA">ARIA</a>], section 5.4)</td>
+        <td>default</td>
+        <td>no</td>
+      </tr>
+    </table>
+  </dt>
+  <dd>
+    <p>The role value is a set of white-space separated machine-extractable semantic information used to define the purpose of the element.</a>.
+    </p>
+  </dd>
+
+
 <h3 id="ARIAStateandPropertyAttributes">State and property attributes (all aria- attributes)</h3>
 
 <p>Every renderable SVG element may have WAI-ARIA state and property attributes