diff --git a/lib/SimpleSAML/Auth/LDAP.php b/lib/SimpleSAML/Auth/LDAP.php
index 328bd6e9c990c27f66efa4537329f2753da39702..945ec4ff88da680abf7da787259653614c102cf7 100644
--- a/lib/SimpleSAML/Auth/LDAP.php
+++ b/lib/SimpleSAML/Auth/LDAP.php
@@ -155,9 +155,11 @@ class SimpleSAML_Auth_LDAP {
 		for ($i = 0; $i < $ldapAttributes['count']; $i++) {
 			$attributeName = $ldapAttributes[$i];
 
+			$base64encode = FALSE;
+			
 			/* Skip the 'jpegphoto' attribute. */
 			if (strtolower($attributeName) === 'jpegphoto') {
-				continue;
+				$base64encode = TRUE;
 			}
 
 			$attribute = $ldapAttributes[$attributeName];
@@ -165,7 +167,7 @@ class SimpleSAML_Auth_LDAP {
 
 			$values = array();
 			for ($j = 0; $j < $valueCount; $j++) {
-				$values[] = $attribute[$j];
+				$values[] = ($base64encode ? base64_encode($attribute[$j]) : $attribute[$j] );
 			}
 
 			$attributes[$attributeName] = $values;