diff --git a/src/Alert.js b/src/Alert.js
index 419b1e6613..4d22b6efe9 100644
--- a/src/Alert.js
+++ b/src/Alert.js
@@ -7,13 +7,15 @@ const Alert = React.createClass({
 
   propTypes: {
     onDismiss: React.PropTypes.func,
-    dismissAfter: React.PropTypes.number
+    dismissAfter: React.PropTypes.number,
+    closeLabel: React.PropTypes.string
   },
 
   getDefaultProps() {
     return {
       bsClass: 'alert',
-      bsStyle: 'info'
+      bsStyle: 'info',
+      closeLabel: 'Close Alert'
     };
   },
 
@@ -22,9 +24,9 @@ const Alert = React.createClass({
       <button
         type="button"
         className="close"
-        onClick={this.props.onDismiss}
-        aria-hidden="true">
-        &times;
+        aria-label={this.props.closeLabel}
+        onClick={this.props.onDismiss}>
+        <span aria-hidden="true">&times;</span>
       </button>
     );
   },
@@ -36,7 +38,7 @@ const Alert = React.createClass({
     classes['alert-dismissable'] = isDismissable;
 
     return (
-      <div {...this.props} className={classNames(this.props.className, classes)}>
+      <div {...this.props} role='alert' className={classNames(this.props.className, classes)}>
         {isDismissable ? this.renderDismissButton() : null}
         {this.props.children}
       </div>
diff --git a/src/Nav.js b/src/Nav.js
index ed3b0d2ac9..d4873cc2b4 100644
--- a/src/Nav.js
+++ b/src/Nav.js
@@ -52,7 +52,7 @@ const Nav = React.createClass({
 
     return (
       <nav {...this.props} className={classNames(this.props.className, classes)}>
-        {this.renderUl()}
+        { this.renderUl() }
       </nav>
     );
   },
@@ -67,7 +67,11 @@ const Nav = React.createClass({
     classes['navbar-right'] = this.props.right;
 
     return (
-      <ul {...this.props} className={classNames(this.props.className, classes)} ref="ul">
+      <ul {...this.props}
+        role={this.props.bsStyle === 'tabs' ? 'tablist' : null}
+        className={classNames(this.props.className, classes)}
+        ref="ul"
+      >
         {ValidComponentChildren.map(this.props.children, this.renderNavItem)}
       </ul>
     );
@@ -95,6 +99,7 @@ const Nav = React.createClass({
     return cloneElement(
       child,
       {
+        role: this.props.bsStyle === 'tabs' ? 'tab' : null,
         active: this.getChildActiveProp(child),
         activeKey: this.props.activeKey,
         activeHref: this.props.activeHref,
diff --git a/src/NavItem.js b/src/NavItem.js
index 9bc768df48..8c853e3912 100644
--- a/src/NavItem.js
+++ b/src/NavItem.js
@@ -6,13 +6,16 @@ const NavItem = React.createClass({
   mixins: [BootstrapMixin],
 
   propTypes: {
+    linkId: React.PropTypes.string,
     onSelect: React.PropTypes.func,
     active: React.PropTypes.bool,
     disabled: React.PropTypes.bool,
     href: React.PropTypes.string,
+    role: React.PropTypes.string,
     title: React.PropTypes.node,
     eventKey: React.PropTypes.any,
-    target: React.PropTypes.string
+    target: React.PropTypes.string,
+    'aria-controls': React.PropTypes.string
   },
 
   getDefaultProps() {
@@ -23,32 +26,37 @@ const NavItem = React.createClass({
 
   render() {
     let {
+        role,
+        linkId,
         disabled,
         active,
         href,
         title,
         target,
         children,
+        'aria-controls': ariaControls,  // eslint-disable-line react/prop-types
         ...props } = this.props; // eslint-disable-line object-shorthand
     let classes = {
           active,
           disabled
         };
     let linkProps = {
+          role,
           href,
           title,
           target,
+          id: linkId,
           onClick: this.handleClick,
           ref: 'anchor'
         };
 
-    if (href === '#') {
+    if (!role && href === '#') {
       linkProps.role = 'button';
     }
 
     return (
-      <li {...props} className={classNames(props.className, classes)}>
-        <a {...linkProps}>
+      <li {...props} role='presentation' className={classNames(props.className, classes)}>
+        <a {...linkProps} aria-selected={active} aria-controls={ariaControls}>
           { children }
         </a>
       </li>
diff --git a/src/Panel.js b/src/Panel.js
index 8da0fd687d..d0bde0f778 100644
--- a/src/Panel.js
+++ b/src/Panel.js
@@ -176,6 +176,7 @@ const Panel = React.createClass({
     return (
       <a
         href={'#' + (this.props.id || '')}
+        aria-controls={this.props.collapsible ? this.props.id : null}
         className={this.isExpanded() ? null : 'collapsed'}
         aria-expanded={this.isExpanded() ? 'true' : 'false'}
         onClick={this.handleSelect}>
diff --git a/src/TabPane.js b/src/TabPane.js
index bd41a6cf9e..3e36db3542 100644
--- a/src/TabPane.js
+++ b/src/TabPane.js
@@ -78,7 +78,11 @@ const TabPane = React.createClass({
     };
 
     return (
-      <div {...this.props} className={classNames(this.props.className, classes)}>
+      <div {...this.props}
+        role='tabpanel'
+        aria-hidden={!this.props.active}
+        className={classNames(this.props.className, classes)}
+      >
         {this.props.children}
       </div>
     );
diff --git a/src/TabbedArea.js b/src/TabbedArea.js
index ee079244bd..fe51a57bf3 100644
--- a/src/TabbedArea.js
+++ b/src/TabbedArea.js
@@ -5,6 +5,9 @@ import ValidComponentChildren from './utils/ValidComponentChildren';
 import Nav from './Nav';
 import NavItem from './NavItem';
 
+let panelId = (props, child) => child.props.id ? child.props.id : props.id && (props.id + '___panel___' + child.props.eventKey);
+let tabId = (props, child) => child.props.id ? child.props.id + '___tab' : props.id && (props.id + '___tab___' + child.props.eventKey);
+
 function getDefaultActiveKeyFromChildren(children) {
   let defaultActiveKey;
 
@@ -61,6 +64,8 @@ const TabbedArea = React.createClass({
   },
 
   render() {
+    let { id, ...props } = this.props; // eslint-disable-line object-shorthand
+
     let activeKey =
       this.props.activeKey != null ? this.props.activeKey : this.state.activeKey;
 
@@ -69,7 +74,7 @@ const TabbedArea = React.createClass({
     }
 
     let nav = (
-      <Nav {...this.props} activeKey={activeKey} onSelect={this.handleSelect} ref="tabs">
+      <Nav {...props} activeKey={activeKey} onSelect={this.handleSelect} ref="tabs">
         {ValidComponentChildren.map(this.props.children, renderTabIfSet, this)}
       </Nav>
     );
@@ -77,7 +82,7 @@ const TabbedArea = React.createClass({
     return (
       <div>
         {nav}
-        <div id={this.props.id} className="tab-content" ref="panes">
+        <div id={id} className="tab-content" ref="panes">
           {ValidComponentChildren.map(this.props.children, this.renderPane)}
         </div>
       </div>
@@ -91,11 +96,15 @@ const TabbedArea = React.createClass({
   renderPane(child, index) {
     let activeKey = this.getActiveKey();
 
+    let active = (child.props.eventKey === activeKey &&
+            (this.state.previousActiveKey == null || !this.props.animation));
+
     return cloneElement(
         child,
         {
-          active: (child.props.eventKey === activeKey &&
-            (this.state.previousActiveKey == null || !this.props.animation)),
+          active,
+          id: panelId(this.props, child),
+          'aria-labelledby': tabId(this.props, child),
           key: child.key ? child.key : index,
           animation: this.props.animation,
           onAnimateOutEnd: (this.state.previousActiveKey != null &&
@@ -106,9 +115,12 @@ const TabbedArea = React.createClass({
 
   renderTab(child) {
     let {eventKey, className, tab, disabled } = child.props;
+
     return (
       <NavItem
+        linkId={tabId(this.props, child)}
         ref={'tab' + eventKey}
+        aria-controls={panelId(this.props, child)}
         eventKey={eventKey}
         className={className}
         disabled={disabled}>
diff --git a/test/AlertSpec.js b/test/AlertSpec.js
index 03e11f65f5..c667c25819 100644
--- a/test/AlertSpec.js
+++ b/test/AlertSpec.js
@@ -71,4 +71,26 @@ describe('Alert', function () {
     );
     assert.ok(React.findDOMNode(instance).className.match(/\balert-danger\b/));
   });
+
+  describe('Web Accessibility', function(){
+    it('Should have alert role', function () {
+      let instance = ReactTestUtils.renderIntoDocument(
+        <Alert>Message</Alert>
+      );
+
+      assert.equal(React.findDOMNode(instance).getAttribute('role'), 'alert');
+    });
+
+    it('Should have add ARIAs to button', function () {
+      let instance = ReactTestUtils.renderIntoDocument(
+        <Alert onDismiss={()=>{}} closeLabel='close'>Message</Alert>
+      );
+
+      let button = ReactTestUtils.findRenderedDOMComponentWithTag(instance, 'button');
+
+      assert.equal(React.findDOMNode(button).getAttribute('aria-label'), 'close');
+      assert.equal(React.findDOMNode(button).children[0].getAttribute('aria-hidden'), 'true');
+    });
+
+  });
 });
diff --git a/test/NavItemSpec.js b/test/NavItemSpec.js
index 3f931ae1c0..a7f6ffb6a1 100644
--- a/test/NavItemSpec.js
+++ b/test/NavItemSpec.js
@@ -106,4 +106,40 @@ describe('NavItem', function () {
     let linkElement = React.findDOMNode(ReactTestUtils.findRenderedDOMComponentWithTag(instance, 'a'));
     assert.equal(linkElement.outerHTML.match('role="button"'), null);
   });
+
+  describe('Web Accessibility', function(){
+
+    it('Should pass aria-controls to the link', function () {
+      let instance = ReactTestUtils.renderIntoDocument(
+          <NavItem href="/path/to/stuff" target="_blank" aria-controls='hi'>Item content</NavItem>
+        );
+
+      let linkElement = React.findDOMNode(ReactTestUtils.findRenderedDOMComponentWithTag(instance, 'a'));
+
+      assert.ok(linkElement.hasAttribute('aria-controls'));
+    });
+
+    it('Should add aria-selected to the link', function () {
+      let instance = ReactTestUtils.renderIntoDocument(
+          <NavItem active>Item content</NavItem>
+        );
+
+      let linkElement = React.findDOMNode(
+        ReactTestUtils.findRenderedDOMComponentWithTag(instance, 'a'));
+
+      assert.equal(linkElement.getAttribute('aria-selected'), 'true');
+    });
+
+    it('Should pass role down', function () {
+      let instance = ReactTestUtils.renderIntoDocument(
+          <NavItem role='tab'>Item content</NavItem>
+        );
+
+      let linkElement = React.findDOMNode(
+        ReactTestUtils.findRenderedDOMComponentWithTag(instance, 'a'));
+
+      assert.equal(linkElement.getAttribute('role'), 'tab');
+    });
+  });
+
 });
diff --git a/test/NavSpec.js b/test/NavSpec.js
index 81a8d09fe4..c53a5bbb55 100644
--- a/test/NavSpec.js
+++ b/test/NavSpec.js
@@ -114,4 +114,23 @@ describe('Nav', function () {
 
     assert.ok(items[0].props.navItem);
   });
+
+
+  describe('Web Accessibility', function(){
+
+    it('Should have tablist and tab roles', function () {
+      let instance = ReactTestUtils.renderIntoDocument(
+          <Nav bsStyle="tabs" activeKey={1}>
+            <NavItem key={1}>Tab 1 content</NavItem>
+            <NavItem key={2}>Tab 2 content</NavItem>
+          </Nav>
+        );
+
+      let ul = ReactTestUtils.scryRenderedDOMComponentsWithTag(instance, 'ul')[0];
+      let navItem = ReactTestUtils.scryRenderedDOMComponentsWithTag(instance, 'a')[0];
+
+      assert.equal(React.findDOMNode(ul).getAttribute('role'), 'tablist');
+      assert.equal(React.findDOMNode(navItem).getAttribute('role'), 'tab');
+    });
+  });
 });
diff --git a/test/PanelSpec.js b/test/PanelSpec.js
index 6247c110b6..aba23266d0 100644
--- a/test/PanelSpec.js
+++ b/test/PanelSpec.js
@@ -123,26 +123,6 @@ describe('Panel', function () {
     assert.ok(anchor.className.match(/\bcollapsed\b/));
   });
 
-  it('Should be aria-expanded=true', function () {
-    let instance = ReactTestUtils.renderIntoDocument(
-      <Panel collapsible={true} expanded={true} header="Heading">Panel content</Panel>
-    );
-    let collapse = React.findDOMNode(instance).querySelector('.panel-collapse');
-    let anchor = React.findDOMNode(instance).querySelector('.panel-title a');
-    assert.equal(collapse.getAttribute('aria-expanded'), 'true');
-    assert.equal(anchor.getAttribute('aria-expanded'), 'true');
-  });
-
-  it('Should be aria-expanded=false', function () {
-    let instance = ReactTestUtils.renderIntoDocument(
-      <Panel collapsible={true} expanded={false} header="Heading">Panel content</Panel>
-    );
-    let collapse = React.findDOMNode(instance).querySelector('.panel-collapse');
-    let anchor = React.findDOMNode(instance).querySelector('.panel-title a');
-    assert.equal(collapse.getAttribute('aria-expanded'), 'false');
-    assert.equal(anchor.getAttribute('aria-expanded'), 'false');
-  });
-
   it('Should call onSelect handler', function (done) {
     function handleSelect (e, key) {
       assert.equal(key, '1');
@@ -204,4 +184,40 @@ describe('Panel', function () {
     assert.equal(children[0].nodeName, 'TABLE');
     assert.notOk(children[0].className.match(/\bpanel-body\b/));
   });
+
+  describe('Web Accessibility', function(){
+
+    it('Should be aria-expanded=true', function () {
+      let instance = ReactTestUtils.renderIntoDocument(
+        <Panel collapsible={true} expanded={true} header="Heading">Panel content</Panel>
+      );
+      let collapse = React.findDOMNode(instance).querySelector('.panel-collapse');
+      let anchor = React.findDOMNode(instance).querySelector('.panel-title a');
+      assert.equal(collapse.getAttribute('aria-expanded'), 'true');
+      assert.equal(anchor.getAttribute('aria-expanded'), 'true');
+    });
+
+    it('Should be aria-expanded=false', function () {
+      let instance = ReactTestUtils.renderIntoDocument(
+        <Panel collapsible={true} expanded={false} header="Heading">Panel content</Panel>
+      );
+      let collapse = React.findDOMNode(instance).querySelector('.panel-collapse');
+      let anchor = React.findDOMNode(instance).querySelector('.panel-title a');
+      assert.equal(collapse.getAttribute('aria-expanded'), 'false');
+      assert.equal(anchor.getAttribute('aria-expanded'), 'false');
+    });
+
+    it('Should add aria-controls with id', function () {
+      let instance = ReactTestUtils.renderIntoDocument(
+        <Panel id='panel-1' collapsible expanded header="Heading">Panel content</Panel>
+      );
+
+      let collapse = React.findDOMNode(instance).querySelector('.panel-collapse');
+      let anchor = React.findDOMNode(instance).querySelector('.panel-title a');
+
+      assert.equal(collapse.getAttribute('id'), 'panel-1');
+      assert.equal(anchor.getAttribute('aria-controls'), 'panel-1');
+    });
+
+  });
 });
diff --git a/test/TabPaneSpec.js b/test/TabPaneSpec.js
index a0615c3016..ecc704da91 100644
--- a/test/TabPaneSpec.js
+++ b/test/TabPaneSpec.js
@@ -16,4 +16,23 @@ describe('TabPane', function () {
     );
     assert.ok(ReactTestUtils.findRenderedDOMComponentWithClass(instance, 'active'));
   });
+
+  describe('Web Accessibility', function(){
+
+    it('Should have aria-hidden', function () {
+      let instance = ReactTestUtils.renderIntoDocument(
+        <TabPane active>Item content</TabPane>
+      );
+
+      assert.equal(React.findDOMNode(instance).getAttribute('aria-hidden'), 'false');
+    });
+
+    it('Should have role', function () {
+      let instance = ReactTestUtils.renderIntoDocument(
+        <TabPane active>Item content</TabPane>
+      );
+
+      assert.equal(React.findDOMNode(instance).getAttribute('role'), 'tabpanel');
+    });
+  });
 });
diff --git a/test/TabbedAreaSpec.js b/test/TabbedAreaSpec.js
index 36ca134160..5d8cf7c065 100644
--- a/test/TabbedAreaSpec.js
+++ b/test/TabbedAreaSpec.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import ReactTestUtils from 'react/lib/ReactTestUtils';
 import TabbedArea from '../src/TabbedArea';
+import NavItem from '../src/NavItem';
 import TabPane from '../src/TabPane';
 import ValidComponentChildren from '../src/utils/ValidComponentChildren';
 
@@ -229,5 +230,49 @@ describe('TabbedArea', function () {
     assert.equal(tabbedArea.refs.tabs.props.activeKey, 2);
   });
 
+  describe('Web Accessibility', function(){
 
+    it('Should generate ids from parent id', function () {
+      let instance = ReactTestUtils.renderIntoDocument(
+        <TabbedArea defaultActiveKey={2} id='tabs'>
+          <TabPane tab="Tab 1" eventKey={1}>Tab 1 content</TabPane>
+          <TabPane tab="Tab 2" eventKey={2}>Tab 2 content</TabPane>
+        </TabbedArea>
+      );
+
+      let tabs = ReactTestUtils.scryRenderedComponentsWithType(instance, NavItem);
+
+      tabs.every(tab =>
+        assert.ok(tab.props['aria-controls'] && tab.props.linkId));
+    });
+
+    it('Should add aria-controls', function () {
+      let instance = ReactTestUtils.renderIntoDocument(
+        <TabbedArea defaultActiveKey={2} id='tabs'>
+          <TabPane id='pane-1' tab="Tab 1" eventKey={1}>Tab 1 content</TabPane>
+          <TabPane id='pane-2' tab="Tab 2" eventKey={2}>Tab 2 content</TabPane>
+        </TabbedArea>
+      );
+
+      let panes = ReactTestUtils.scryRenderedComponentsWithType(instance, TabPane);
+
+      assert.equal(panes[0].props['aria-labelledby'], 'pane-1___tab');
+      assert.equal(panes[1].props['aria-labelledby'], 'pane-2___tab');
+    });
+
+    it('Should add aria-controls', function () {
+      let instance = ReactTestUtils.renderIntoDocument(
+        <TabbedArea defaultActiveKey={2} id='tabs'>
+          <TabPane id='pane-1' tab="Tab 1" eventKey={1}>Tab 1 content</TabPane>
+          <TabPane id='pane-2' tab="Tab 2" eventKey={2}>Tab 2 content</TabPane>
+        </TabbedArea>
+      );
+
+      let tabs = ReactTestUtils.scryRenderedComponentsWithType(instance, NavItem);
+
+      assert.equal(tabs[0].props['aria-controls'], 'pane-1');
+      assert.equal(tabs[1].props['aria-controls'], 'pane-2');
+    });
+
+  });
 });