diff --git a/modules/saml/docs/sp.txt b/modules/saml/docs/sp.txt
index 3d1f382b783e70ab2f58b5835cd94d1f211a9f3b..3d0c55aead7120b219861de04145b21a65d39cfa 100644
--- a/modules/saml/docs/sp.txt
+++ b/modules/saml/docs/sp.txt
@@ -102,6 +102,18 @@ Options
 
 :   *Note*: SAML 2 specific.
 
+`attributes`
+:   List of attributes this SP requests from the IdP.
+    This list will be added to the generated metadata.
+
+:   The attributes will be added without a `NameFormat` by default.
+    Use the `attributes.NameFormat` option to specify the `NameFormat` for the attributes.
+
+:   *Note*: This list will only be added to the metadata if the `name`-option is also specified.
+
+`attributes.NameFormat`
+:   The `NameFormat` for the requested attributes.
+
 `AuthnContextClassRef`
 :   The SP can request authentication with a specific authentication context class.
     One example of usage could be if the IdP supports both username/password authentication as well as software-PKI.
@@ -115,7 +127,8 @@ Options
 :   File name of certificate for this SP. This certificate will be included in generated metadata.
 
 `description`
-:   A description of this SP. Will be added to the generated metadata.
+:   A description of this SP.
+    Will be added to the generated metadata, in an AttributeConsumingService element.
 
 :   This option can be translated into multiple languages by specifying the value as an array of language-code to translated description:
 
@@ -124,6 +137,8 @@ Options
             'no' => 'En tjeneste',
         ),
 
+:   *Note*: For this to be added to the metadata, you must also specify the `attributes` and `name` options.
+
 `discoURL`
 :   Set which IdP discovery service this SP should use.
     If this is unset, the IdP discovery service specified in the global option `idpdisco.url.{saml20|shib13}` in `config/config.php` will be used.
@@ -152,7 +167,8 @@ Options
 :   *Note*: SAML 2 specific.
 
 `name`
-:   The name of this SP. Will be added to the generated metadata.
+:   The name of this SP.
+    Will be added to the generated metadata, in an AttributeConsumingService element.
 
 :   This option can be translated into multiple languages by specifying the value as an array of language-code to translated name:
 
@@ -161,6 +177,8 @@ Options
             'no' => 'En tjeneste',
         ),
 
+:   *Note*: You must also specify at least one attribute in the `attributes` option for this element to be added to the metadata.
+
 `NameIDPolicy`
 :   The format of the NameID we request from the IdP.
     Defaults to the transient format if unspecified.
diff --git a/modules/saml/www/sp/metadata.php b/modules/saml/www/sp/metadata.php
index f228a9bb30b6e39ab52c38c5d08533a10f2635a9..8e0761598002d180fa86976923f898dc2d7976c0 100644
--- a/modules/saml/www/sp/metadata.php
+++ b/modules/saml/www/sp/metadata.php
@@ -71,7 +71,21 @@ if ($certInfo !== NULL && array_key_exists('certData', $certInfo)) {
 	$metaArray20['certData'] = $certData;
 }
 
+$name = $spconfig->getLocalizedString('name', NULL);
+$attributes = $spconfig->getArray('attributes', array());
+if ($name !== NULL && !empty($attributes)) {
+	/* We have everything necessary to add an AttributeConsumingService. */
 
+	$metaArray20['name'] = $name;
+
+	$description = $spconfig->getLocalizedString('description', NULL);
+	if ($description !== NULL) {
+		$metaArray20['description'] = $description;
+	}
+
+	$metaArray20['attributes'] = $attributes;
+	$metaArray20['attributes.NameFormat'] = $spconfig->getString('attributes.NameFormat', SAML2_Const::NAMEFORMAT_UNSPECIFIED);
+}
 
 $metaBuilder = new SimpleSAML_Metadata_SAMLBuilder($entityId);
 $metaBuilder->addMetadataSP11($metaArray11);