diff --git a/lib/SimpleSAML/Metadata/SAMLBuilder.php b/lib/SimpleSAML/Metadata/SAMLBuilder.php
index 1c93c61a288b6e8e87bfd8d74236d60756b1f8f4..3944c43d8248926f28c0d12a2041ba378fed6940 100644
--- a/lib/SimpleSAML/Metadata/SAMLBuilder.php
+++ b/lib/SimpleSAML/Metadata/SAMLBuilder.php
@@ -283,6 +283,9 @@ class SimpleSAML_Metadata_SAMLBuilder {
 		case 'shib13-idp-remote':
 			$this->addMetadataIdP11($metadata);
 			break;
+		case 'attributeauthority-remote':
+			$this->addAttributeAuthority($metadata);
+			break;
 		default:
 			SimpleSAML_Logger::warning('Unable to generate metadata for unknown type \'' . $set . '\'.');
 		}
@@ -488,6 +491,37 @@ class SimpleSAML_Metadata_SAMLBuilder {
 	}
 
 
+	/**
+	 * Add a AttributeAuthorityDescriptor.
+	 *
+	 * @param array $metadata  The AttributeAuthorityDescriptor, in the format returned by SAMLParser.
+	 */
+	public function addAttributeAuthority(array $metadata) {
+		assert('is_array($metadata)');
+		assert('isset($metadata["entityid"])');
+		assert('isset($metadata["metadata-set"])');
+
+		$metadata = SimpleSAML_Configuration::loadFromArray($metadata, $metadata['entityid']);
+
+		$e = $this->createElement('AttributeAuthorityDescriptor');
+		$e->setAttribute('protocolSupportEnumeration', implode(' ', $metadata->getArray('protocols', array())));
+
+		$this->addExtensions($metadata, $e);
+		$this->addCertificate($e, $metadata);
+
+		$this->addEndpoints($e, 'AttributeService', $metadata->getEndpoints('AttributeService'));
+		$this->addEndpoints($e, 'AssertionIDRequestService', $metadata->getEndpoints('AssertionIDRequestService'));
+
+		foreach ($metadata->getArray('NameIDFormat', array()) as $format) {
+			$t = $this->createElement('NameIDFormat');
+			$t->appendChild($this->document->createTextNode($format));
+			$e->appendChild($t);
+		}
+
+		$this->entityDescriptor->appendChild($e);
+	}
+
+
 	/**
 	 * Add contact information.
 	 *