diff --git a/lib/SimpleSAML/Metadata/SAMLBuilder.php b/lib/SimpleSAML/Metadata/SAMLBuilder.php
index 735f4d590ff27a01831748765d4fc1ee08936fcd..315aa91ab7dd6b05a9f704be6a6888bd3bf4eed5 100644
--- a/lib/SimpleSAML/Metadata/SAMLBuilder.php
+++ b/lib/SimpleSAML/Metadata/SAMLBuilder.php
@@ -230,9 +230,9 @@ class SimpleSAML_Metadata_SAMLBuilder {
 		$e->setAttribute('protocolSupportEnumeration', 'urn:oasis:names:tc:SAML:2.0:protocol');
 		
 		
-#		$this->addExtensions($metadata);
+		$this->addExtensions($metadata);
 
-#		$this->addCertificate($e, $metadata);
+		$this->addCertificate($e, $metadata);
 
 		if (array_key_exists('SingleLogoutService', $metadata)) {
 			$t = $this->createElement('SingleLogoutService');
@@ -311,7 +311,7 @@ class SimpleSAML_Metadata_SAMLBuilder {
 
 		$this->entityDescriptor->appendChild($e);
 		
-#		$this->addOrganizationInfo($metadata);
+		$this->addOrganizationInfo($metadata);
 		
 		if (array_key_exists('contacts', $metadata) && is_array($metadata['contacts']) ) {
 			foreach($metadata['contacts'] AS $contact) {
@@ -352,9 +352,9 @@ class SimpleSAML_Metadata_SAMLBuilder {
 			$e->setAttribute('WantAuthnRequestSigned', 'true');
 		}
 		
-#		$this->addExtensions($metadata);
+		$this->addExtensions($metadata);
 
-#		$this->addCertificate($e, $metadata);
+		$this->addCertificate($e, $metadata);
 
 		if (array_key_exists('SingleLogoutService', $metadata)) {
 			$t = $this->createElement('SingleLogoutService');
@@ -383,7 +383,7 @@ class SimpleSAML_Metadata_SAMLBuilder {
 		
 		$this->entityDescriptor->appendChild($e);
 		
-#		$this->addOrganizationInfo($metadata);
+		$this->addOrganizationInfo($metadata);
 		
 		if (array_key_exists('contacts', $metadata) && is_array($metadata['contacts']) ) {
 			foreach($metadata['contacts'] AS $contact) {
@@ -418,7 +418,7 @@ class SimpleSAML_Metadata_SAMLBuilder {
 		$e = $this->createElement('SPSSODescriptor');
 		$e->setAttribute('protocolSupportEnumeration', 'urn:oasis:names:tc:SAML:1.1:protocol');
 
-#		$this->addCertificate($e, $metadata);
+		$this->addCertificate($e, $metadata);
 
 		if (array_key_exists('NameIDFormat', $metadata)) {
 			$t = $this->createElement('NameIDFormat');
@@ -449,7 +449,7 @@ class SimpleSAML_Metadata_SAMLBuilder {
 		$e = $this->createElement('IDPSSODescriptor');
 		$e->setAttribute('protocolSupportEnumeration', 'urn:oasis:names:tc:SAML:1.1:protocol');
 
-#		$this->addCertificate($e, $metadata);
+		$this->addCertificate($e, $metadata);
 
 		if (array_key_exists('NameIDFormat', $metadata)) {
 			$t = $this->createElement('NameIDFormat');