diff --git a/lib/SimpleSAML/XML/Shib13/AuthnResponse.php b/lib/SimpleSAML/XML/Shib13/AuthnResponse.php
index 00e4f75b0fb8a645fcebacfe73c661fc1297c89a..83c783a7ab5b7941552ebf71f36d92468de926b5 100644
--- a/lib/SimpleSAML/XML/Shib13/AuthnResponse.php
+++ b/lib/SimpleSAML/XML/Shib13/AuthnResponse.php
@@ -296,7 +296,7 @@ class SimpleSAML_XML_Shib13_AuthnResponse extends SimpleSAML_XML_AuthnResponse {
 
 		$shire = $spmd['shire'];
 		$audience = $spmd['audience'];
-		$base64 = $idpmd['base64'];
+		$base64 = $spmd['base64attributes'];
 		
 		$encodedattributes = '';
 		
diff --git a/metadata-templates/saml20-sp-remote.php b/metadata-templates/saml20-sp-remote.php
index 20d94352361f29c086725bf9b0b343f27fcb8df3..eee631f75213f410ef91c39775270a1d403302cc 100644
--- a/metadata-templates/saml20-sp-remote.php
+++ b/metadata-templates/saml20-sp-remote.php
@@ -34,7 +34,7 @@ $metadata = array(
 		'base64attributes'	=>	false,
 		'simplesaml.attributes'			=>	true,
 		//'attributemap'				=>	'test',
-		//'attributes'					=>	array('mail')
+		//'attributes'					=>	array('mail'),
 		
 		
 		/*
diff --git a/metadata-templates/shib13-idp-hosted.php b/metadata-templates/shib13-idp-hosted.php
index 80c1c6b91b4428b4e95ad692d5c82819e600995d..10a5f190b3dc4f3aa0e895a30caf8060bc80e777 100644
--- a/metadata-templates/shib13-idp-hosted.php
+++ b/metadata-templates/shib13-idp-hosted.php
@@ -12,8 +12,6 @@ $metadata = array(
 		'issuer'						=>	'dev3.andreas.feide.no',
 		'host'							=>	'dev3.andreas.feide.no',
 		'audience'						=> 'urn:mace:feide:shiblab',
-
-		'base64'			=> false,
 		
 		// X.509 key and certificate. Relative to the cert directory.
 		'privatekey'		=>	'server.pem',
diff --git a/metadata-templates/shib13-sp-remote.php b/metadata-templates/shib13-sp-remote.php
index 62f4e2bc879119e057959168c53700b21b910c0a..0c8c1a70b3736ef9da548e0bf2702c27e0800a0f 100644
--- a/metadata-templates/shib13-sp-remote.php
+++ b/metadata-templates/shib13-sp-remote.php
@@ -12,19 +12,23 @@ $metadata = array(
 
 	'https://sp.shiblab.feide.no'	=> array(
 		'AssertionConsumerService'				=>	'http://sp.shiblab.feide.no/Shibboleth.sso/SAML/POST',
-		'audience'			=>	'urn:mace:feide:shiblab'
+		'audience'			=>	'urn:mace:feide:shiblab',
+		'base64attributes'			=> false
 	),
 	'urn:geant:edugain:component:be:switchaai-test:central' => array(
 		'AssertionConsumerService'				=>	'https://edugain-login.switch.ch/ShiBE-R/WebSSOResponseListener',
-		'audience'			=>	'urn:geant:edugain:component:be:switchaai-test:central'
+		'audience'			=>	'urn:geant:edugain:component:be:switchaai-test:central',
+		'base64attributes'			=> false
 	),
 	'urn:geant:edugain:component:be:rediris:rediris.es' => array(
 		'AssertionConsumerService'				=>	'http://serrano.rediris.es:8080/PAPIWebSSOResponseListener/request',
-		'audience'			=>	'urn:geant:edugain:component:be:rediris:rediris.es'
+		'audience'			=>	'urn:geant:edugain:component:be:rediris:rediris.es',
+		'base64attributes'			=> false
 	),
 	'https://skjak.uninett.no/shibboleth/target' => array(
 		'AssertionConsumerService'				=>	'https://skjak.uninett.no/Shibboleth.shire',
-		'audience'			=>	'https://skjak.uninett.no/shibboleth/target'
+		'audience'			=>	'https://skjak.uninett.no/shibboleth/target',
+		'base64attributes'			=> false
 	)
 
 );