diff --git a/build/tasks/aria-supported.js b/build/tasks/aria-supported.js
index 24e81b8c1c..12ff0ab2df 100644
--- a/build/tasks/aria-supported.js
+++ b/build/tasks/aria-supported.js
@@ -10,108 +10,188 @@ module.exports = function(grunt) {
 		'aria-supported',
 		'Task for generating a diff of supported aria roles and properties.',
 		function() {
-			const entry = this.data.entry;
-			const destFile = this.data.destFile;
-			const listType = this.data.listType.toLowerCase();
-
 			/**
-			 * `axe` has to be dynamically required at this stage, as `axe` does not exist until grunt task `build:uglify` is complete, and hence cannot be required at the top of the file.
+			 * NOTE:
+			 * `axe` has to be dynamically required at this stage,
+			 * as `axe` does not exist until grunt task `build:uglify` is complete,
+			 * hence cannot be required at the top of the file.
 			 */
 			const axe = require('../../axe');
+			const listType = this.data.listType.toLowerCase();
+			const headings = {
+				main:
+					`# ARIA Roles and Attributes ${
+						listType === 'all' ? 'available' : listType
+					} in axe-core.\n\n` +
+					'It can be difficult to know which features of web technologies are accessible across ' +
+					'different platforms, and with different screen readers and other assistive technologies. ' +
+					'Axe-core does some of this work for you, by raising issues when accessibility features are ' +
+					'used that are known to cause problems.\n\n' +
+					'This page contains a list of ARIA 1.1 features that axe-core raises as unsupported. ' +
+					'For more information, read [We’ve got your back with “Accessibility Supported” in axe]' +
+					'(https://www.deque.com/blog/weve-got-your-back-with-accessibility-supported-in-axe/).\n\n' +
+					'For a detailed description about how accessibility support is decided, see [How we make ' +
+					'decisions on rules](accessibility-supported.md).',
+				rolesMdTableHeader: ['aria-role', 'axe-core support'],
+				attributesMdTableHeader: ['aria-attribute', 'axe-core support']
+			};
+
+			const { diff: rolesTable, notes: rolesFootnotes } = getDiff(
+				roles,
+				axe.commons.aria.lookupTable.role,
+				listType
+			);
+			const rolesTableMarkdown = mdTable([
+				headings.rolesMdTableHeader,
+				...rolesTable
+			]);
+
+			const ariaQueryAriaAttributes = getAriaQueryAttributes();
+			const { diff: attributesTable, notes: attributesFootnotes } = getDiff(
+				ariaQueryAriaAttributes,
+				axe.commons.aria.lookupTable.attributes,
+				listType
+			);
+			const attributesTableMarkdown = mdTable([
+				headings.attributesMdTableHeader,
+				...attributesTable
+			]);
+
+			const footnotes = [...rolesFootnotes, ...attributesFootnotes].map(
+				(footnote, index) => `[^${index + 1}]: ${footnote}`
+			);
+
+			const content = `${
+				headings.main
+			}\n\n## Roles\n\n${rolesTableMarkdown}\n\n## Attributes\n\n${attributesTableMarkdown}\n\n${footnotes}`;
+
+			const destFile = this.data.destFile;
+			// Format the content so Prettier doesn't create a diff after running.
+			// See https://github.com/dequelabs/axe-core/issues/1310.
+			const formattedContent = format(content, destFile);
+
+			// write `aria supported` file contents
+			grunt.file.write(destFile, formattedContent);
 
 			/**
-			 * As `aria-query` roles map, does not list all aria attributes in its props,
-			 * the below reduce function aims to concatanate and unique the below two,
-			 * - list from props with in roles map
-			 * - list from aria map
-			 *
-			 * @return {Map} `aQaria` - This gives a composite list of aria attributes, which is later used to diff against axe-core supported attributes.
+			 * Get list of aria attributes, from `aria-query`
+			 * @returns {Set|Object} collection of aria attributes from `aria-query` module
 			 */
-			const ariaKeys = Array.from(props).map(([key]) => key);
-			const roleAriaKeys = Array.from(roles).reduce((out, [name, rule]) => {
-				return [...out, ...Object.keys(rule.props)];
-			}, []);
-			const aQaria = new Set(axe.utils.uniqueArray(roleAriaKeys, ariaKeys));
+			function getAriaQueryAttributes() {
+				const ariaKeys = Array.from(props).map(([key]) => key);
+				const roleAriaKeys = Array.from(roles).reduce((out, [name, rule]) => {
+					return [...out, ...Object.keys(rule.props)];
+				}, []);
+				return new Set(axe.utils.uniqueArray(roleAriaKeys, ariaKeys));
+			}
 
 			/**
 			 * Given a `base` Map and `subject` Map object,
 			 * The function converts the `base` Map entries to an array which is sorted then enumerated to compare each entry against the `subject` Map
-			 * The function constructs a `string` to represent a `markdown table` to
+			 * The function constructs a `string` to represent a `markdown table`, as well as returns notes to append to footnote
 			 * @param {Map} base Base Map Object
 			 * @param {Map} subject Subject Map Object
-			 * @return {Array[]} Example Output: [ [ 'alert', 'No' ], [ 'figure', 'Yes' ] ]
+			 * @param {String} type type to compare
+			 * @returns {Array<Object>[]}
+			 * @example Example Output: [ [ 'alert', 'No' ], [ 'figure', 'Yes' ] ]
 			 */
-			const getDiff = (base, subject) => {
-				return Array.from(base.entries())
-					.sort()
-					.reduce((out, [key] = item) => {
-						switch (listType) {
-							case 'supported':
-								if (
-									subject.hasOwnProperty(key) &&
-									subject[key].unsupported === false
-								) {
-									out.push([`${key}`, 'Yes']);
-								}
-								break;
-							case 'unsupported':
-								if (
-									(subject[key] && subject[key].unsupported === true) ||
-									!subject.hasOwnProperty(key)
-								) {
-									out.push([`${key}`, 'No']);
+			function getDiff(base, subject, type) {
+				const diff = [];
+				const notes = [];
+
+				const sortedBase = Array.from(base.entries()).sort();
+
+				sortedBase.forEach(([key] = item) => {
+					switch (type) {
+						case 'supported':
+							if (
+								subject.hasOwnProperty(key) &&
+								subject[key].unsupported === false
+							) {
+								diff.push([`${key}`, 'Yes']);
+							}
+							break;
+						case 'unsupported':
+							if (
+								(subject[key] && subject[key].unsupported === true) ||
+								!subject.hasOwnProperty(key)
+							) {
+								diff.push([`${key}`, 'No']);
+							} else if (
+								subject[key] &&
+								subject[key].unsupported &&
+								subject[key].unsupported.exceptions
+							) {
+								diff.push([`${key}`, `Mixed[^${notes.length + 1}]`]);
+								notes.push(
+									getSupportedElementsAsFootnote(
+										subject[key].unsupported.exceptions
+									)
+								);
+							}
+							break;
+						case 'all':
+						default:
+							diff.push([
+								`${key}`,
+								subject.hasOwnProperty(key) &&
+								subject[key].unsupported === false
+									? 'Yes'
+									: 'No'
+							]);
+							break;
+					}
+				});
+
+				return {
+					diff,
+					notes
+				};
+			}
+
+			/**
+			 * Parse a list of unsupported exception elements and add a footnote
+			 * detailing which HTML elements are supported.
+			 *
+			 * @param {Array<String|Object>} elements List of supported elements
+			 * @returns {Array<String|Object>} notes
+			 */
+			function getSupportedElementsAsFootnote(elements) {
+				const notes = [];
+
+				const supportedElements = elements.map(element => {
+					if (typeof element === 'string') {
+						return `\`<${element}>\``;
+					}
+
+					/**
+					 * if element is not a string it will be an object with structure:
+							{
+								nodeName: string,
+								properties: {
+									type: {string|string[]}
 								}
-								break;
-							case 'all':
-							default:
-								out.push([
-									`${key}`,
-									subject.hasOwnProperty(key) &&
-									subject[key].unsupported === false
-										? 'Yes'
-										: 'No'
-								]);
-								break;
+							}
+					*/
+					return Object.keys(element.properties).map(prop => {
+						const value = element.properties[prop];
+
+						// the 'type' property can be a string or an array
+						if (typeof value === 'string') {
+							return `\`<${element.nodeName} ${prop}="${value}">\``;
 						}
-						return out;
-					}, []);
-			};
 
-			const getMdContent = (heading, rolesTable, attributesTable) => {
-				return `${heading}\n\n## Roles\n\n${rolesTable}\n\n## Attributes\n\n${attributesTable}`;
-			};
+						// output format for an array of types:
+						// <input type="button" | "checkbox">
+						const values = value.map(v => `"${v}"`).join(' | ');
+						return `\`<${element.nodeName} ${prop}=${values}>\``;
+					});
+				});
 
-			const generateDoc = () => {
-				const content = getMdContent(
-					`# ARIA Roles and Attributes ${
-						listType === 'all' ? 'available' : listType
-					} in axe-core.\n\n` +
-						'It can be difficult to know which features of web technologies are accessible across ' +
-						'different platforms, and with different screen readers and other assistive technologies. ' +
-						'Axe-core does some of this work for you, by raising issues when accessibility features are ' +
-						'used that are known to cause problems.\n\n' +
-						'This page contains a list of ARIA 1.1 features that axe-core raises as unsupported. ' +
-						'For more information, read [We’ve got your back with “Accessibility Supported” in axe]' +
-						'(https://www.deque.com/blog/weve-got-your-back-with-accessibility-supported-in-axe/).\n\n' +
-						'For a detailed description about how accessibility support is decided, see [How we make ' +
-						'decisions on rules](accessibility-supported.md).',
-					mdTable([
-						['aria-role', 'axe-core support'],
-						...getDiff(roles, axe.commons.aria.lookupTable.role)
-					]),
-					mdTable([
-						['aria-attribute', 'axe-core support'],
-						...getDiff(aQaria, axe.commons.aria.lookupTable.attributes)
-					])
-				);
-
-				// Format the content so Prettier doesn't create a diff after running.
-				// See https://github.com/dequelabs/axe-core/issues/1310.
-				const formattedContent = format(content, destFile);
-				grunt.file.write(destFile, formattedContent);
-			};
+				notes.push('Supported on elements: ' + supportedElements.join(', '));
 
-			generateDoc();
+				return notes;
+			}
 		}
 	);
 };
diff --git a/doc/aria-supported.md b/doc/aria-supported.md
index 285d5b1a6f..e568c0db0f 100644
--- a/doc/aria-supported.md
+++ b/doc/aria-supported.md
@@ -18,4 +18,6 @@ For a detailed description about how accessibility support is decided, see [How
 | -------------------- | ---------------- |
 | aria-describedat     | No               |
 | aria-details         | No               |
-| aria-roledescription | No               |
+| aria-roledescription | Mixed[^1]        |
+
+[^1]: Supported on elements: `<button>`, `<input type="button" | "checkbox" | "image" | "radio" | "reset" | "submit">`, `<img>`, `<select>`, `<summary>`
diff --git a/lib/checks/aria/unsupportedattr.js b/lib/checks/aria/unsupportedattr.js
index f031805a3f..b485d5019e 100644
--- a/lib/checks/aria/unsupportedattr.js
+++ b/lib/checks/aria/unsupportedattr.js
@@ -1,16 +1,39 @@
-let unsupported = Array.from(node.attributes)
-	.filter(candidate => {
-		// filter out unsupported attributes
-		return axe.commons.aria.validateAttr(candidate.name, {
-			flagUnsupported: true
+const nodeName = node.nodeName.toUpperCase();
+const lookupTable = axe.commons.aria.lookupTable;
+const role = axe.commons.aria.getRole(node);
+
+const unsupportedAttrs = Array.from(node.attributes)
+	.filter(({ name }) => {
+		const attribute = lookupTable.attributes[name];
+
+		if (!axe.commons.aria.validateAttr(name)) {
+			return false;
+		}
+
+		const { unsupported } = attribute;
+
+		if (typeof unsupported !== 'object') {
+			return !!unsupported;
+		}
+
+		// validate attributes and conditions (if any) from allowedElement to given node
+		const isException = axe.commons.matches(node, unsupported.exceptions);
+
+		if (!Object.keys(lookupTable.evaluateRoleForElement).includes(nodeName)) {
+			return !isException;
+		}
+
+		// evaluate a given aria-role, execute the same
+		return !lookupTable.evaluateRoleForElement[nodeName]({
+			node,
+			role,
+			out: isException
 		});
 	})
-	.map(candidate => {
-		return candidate.name.toString();
-	});
+	.map(candidate => candidate.name.toString());
 
-if (unsupported.length) {
-	this.data(unsupported);
+if (unsupportedAttrs.length) {
+	this.data(unsupportedAttrs);
 	return true;
 }
 return false;
diff --git a/lib/commons/aria/attributes.js b/lib/commons/aria/attributes.js
index 1207d78e8b..3d5de378cc 100644
--- a/lib/commons/aria/attributes.js
+++ b/lib/commons/aria/attributes.js
@@ -37,13 +37,9 @@ aria.allowedAttr = function(role) {
  * @memberof axe.commons.aria
  * @instance
  * @param  {String} att The attribute name
- * @param  {Object} options Use `flagUnsupported: true` to report unsupported attributes
  * @return {Boolean}
  */
-aria.validateAttr = function(att, { flagUnsupported = false } = {}) {
+aria.validateAttr = function validateAttr(att) {
 	const attrDefinition = aria.lookupTable.attributes[att];
-	if (flagUnsupported && attrDefinition) {
-		return !!attrDefinition.unsupported;
-	}
 	return !!attrDefinition;
 };
diff --git a/lib/commons/aria/index.js b/lib/commons/aria/index.js
index 3903806129..7389886c22 100644
--- a/lib/commons/aria/index.js
+++ b/lib/commons/aria/index.js
@@ -196,7 +196,22 @@ lookupTable.attributes = {
 		unsupported: false
 	},
 	'aria-roledescription': {
-		unsupported: true
+		type: 'string',
+		allowEmpty: true,
+		unsupported: {
+			exceptions: [
+				'button',
+				{
+					nodeName: 'input',
+					properties: {
+						type: ['button', 'checkbox', 'image', 'radio', 'reset', 'submit']
+					}
+				},
+				'img',
+				'select',
+				'summary'
+			]
+		}
 	},
 	'aria-rowcount': {
 		type: 'int',
@@ -260,7 +275,8 @@ lookupTable.globalAttributes = [
 	'aria-labelledby',
 	'aria-live',
 	'aria-owns',
-	'aria-relevant'
+	'aria-relevant',
+	'aria-roledescription'
 ];
 
 lookupTable.role = {
diff --git a/test/checks/aria/unsupportedattr.js b/test/checks/aria/unsupportedattr.js
index 07918d511b..efe7786c1d 100644
--- a/test/checks/aria/unsupportedattr.js
+++ b/test/checks/aria/unsupportedattr.js
@@ -49,4 +49,66 @@ describe('unsupportedattr', function() {
 		);
 		assert.isFalse(check.evaluate.apply(checkContext, params));
 	});
+
+	it('should return false if applied to an element that matches the unsupported "exceptions" list', function() {
+		axe.commons.aria.lookupTable.attributes['aria-mccheddarton'] = {
+			unsupported: {
+				exceptions: ['button']
+			}
+		};
+		var params = checkSetup(
+			'<button id="target" aria-mccheddarton="true">Contents</button>'
+		);
+		assert.isFalse(check.evaluate.apply(checkContext, params));
+	});
+
+	it('should return false if applied to an element that matches the unsupported "exceptions" list using complex conditions', function() {
+		axe.commons.aria.lookupTable.attributes['aria-mccheddarton'] = {
+			unsupported: {
+				exceptions: [
+					{
+						nodeName: 'input',
+						properties: {
+							type: 'checkbox'
+						}
+					}
+				]
+			}
+		};
+		var params = checkSetup(
+			'<input type="checkbox" id="target" aria-mccheddarton="true">'
+		);
+		assert.isFalse(check.evaluate.apply(checkContext, params));
+	});
+
+	it('should return true if applied to an element that does not match the unsupported "exceptions" list', function() {
+		axe.commons.aria.lookupTable.attributes['aria-mccheddarton'] = {
+			unsupported: {
+				exceptions: ['button']
+			}
+		};
+		var params = checkSetup(
+			'<div id="target" aria-mccheddarton="true">Contents</div>'
+		);
+		assert.isTrue(check.evaluate.apply(checkContext, params));
+	});
+
+	it('should return true if applied to an element that does not match the unsupported "exceptions" list using complex conditions', function() {
+		axe.commons.aria.lookupTable.attributes['aria-mccheddarton'] = {
+			unsupported: {
+				exceptions: [
+					{
+						nodeName: 'input',
+						properties: {
+							type: 'checkbox'
+						}
+					}
+				]
+			}
+		};
+		var params = checkSetup(
+			'<input type="radio" id="target" aria-mccheddarton="true">'
+		);
+		assert.isTrue(check.evaluate.apply(checkContext, params));
+	});
 });
diff --git a/test/checks/aria/valid-attr.js b/test/checks/aria/valid-attr.js
index 1ad79ef43b..9f1bb4e056 100644
--- a/test/checks/aria/valid-attr.js
+++ b/test/checks/aria/valid-attr.js
@@ -21,7 +21,7 @@ describe('aria-valid-attr', function() {
 		assert.deepEqual(checkContext._data, ['aria-cats', 'aria-dogs']);
 	});
 
-	it('should return false if no invalid ARIA attributes are found', function() {
+	it('should return true if no invalid ARIA attributes are found', function() {
 		var node = document.createElement('div');
 		node.id = 'test';
 		node.tabIndex = 1;
@@ -54,6 +54,21 @@ describe('aria-valid-attr', function() {
 		axe.commons.aria.validateAttr = orig;
 	});
 
+	it('should return true for unsupported ARIA attributes', function() {
+		axe.commons.aria.lookupTable.attributes['aria-mccheddarton'] = {
+			unsupported: true
+		};
+
+		var node = document.createElement('div');
+		node.id = 'test';
+		node.tabIndex = 1;
+		node.setAttribute('aria-mccheddarton', 'true');
+		fixture.appendChild(node);
+
+		assert.isTrue(checks['aria-valid-attr'].evaluate.call(checkContext, node));
+		assert.isNull(checkContext._data);
+	});
+
 	describe('options', function() {
 		it('should exclude provided attribute names', function() {
 			fixture.innerHTML =
diff --git a/test/integration/rules/aria-allowed-attr/failures.html b/test/integration/rules/aria-allowed-attr/failures.html
index d1bac40aae..2c0e7ab0db 100644
--- a/test/integration/rules/aria-allowed-attr/failures.html
+++ b/test/integration/rules/aria-allowed-attr/failures.html
@@ -3,7 +3,13 @@
 <div role="link" aria-selected="true" id="fail2">fail</div>
 <div role="row" aria-colcount="value" id="fail3">fail</div>
 <div role="row" aria-rowcount="value" id="fail4">fail</div>
+
+
+
 <!-- unsupported attributes -->
 <div aria-describedat="#fail4" id="fail5">fail</div>
 <div aria-details="fail5" id="fail6">fail</div>
 <div aria-roledescription="Slide" id="fail7">fail</div>
+<p id="fail8" aria-roledescription="status">warning: things are a wee bit bit slow</p>
+<input id="fail9" type='text' aria-roledescription="input" />
+<textarea id="fail10" type='text' aria-roledescription="comments"></textarea>
\ No newline at end of file
diff --git a/test/integration/rules/aria-allowed-attr/failures.json b/test/integration/rules/aria-allowed-attr/failures.json
index e4cdd7a24c..b2bd48b3da 100644
--- a/test/integration/rules/aria-allowed-attr/failures.json
+++ b/test/integration/rules/aria-allowed-attr/failures.json
@@ -8,6 +8,9 @@
 		["#fail4"],
 		["#fail5"],
 		["#fail6"],
-		["#fail7"]
+		["#fail7"],
+		["#fail8"],
+		["#fail9"],
+		["#fail10"]
 	]
 }
diff --git a/test/integration/rules/aria-allowed-attr/passes.html b/test/integration/rules/aria-allowed-attr/passes.html
index 3a27d7edcb..efa8207039 100644
--- a/test/integration/rules/aria-allowed-attr/passes.html
+++ b/test/integration/rules/aria-allowed-attr/passes.html
@@ -142,3 +142,6 @@
 
 <input type="checkbox" aria-required="true" id="pass71" />
 <div role="checkbox" aria-required="true" id="pass72">ok</div>
+
+<button id="pass73" aria-roledescription="attachment button"></button>
+<input type="checkbox" aria-roledescription="cuisine type checkbox" id="pass74" />
diff --git a/test/integration/rules/aria-allowed-attr/passes.json b/test/integration/rules/aria-allowed-attr/passes.json
index 1b34b38f30..8c4b057b05 100644
--- a/test/integration/rules/aria-allowed-attr/passes.json
+++ b/test/integration/rules/aria-allowed-attr/passes.json
@@ -74,6 +74,8 @@
 		["#pass69"],
 		["#pass70"],
 		["#pass71"],
-		["#pass72"]
+		["#pass72"],
+		["#pass73"],
+		["#pass74"]
 	]
 }