diff --git a/lib/SimpleSAML/Metadata/SAMLParser.php b/lib/SimpleSAML/Metadata/SAMLParser.php
index 6b2031f4dc573c7182252accb41465c594511315..57da6958880201a9b175e2b72ee7c6db42243a7f 100644
--- a/lib/SimpleSAML/Metadata/SAMLParser.php
+++ b/lib/SimpleSAML/Metadata/SAMLParser.php
@@ -458,7 +458,7 @@ class SimpleSAML_Metadata_SAMLParser {
 				continue;
 			}
 
-			$ret['certData'] = str_replace(array("\r", "\n"), '', $key['X509Certificate']);
+			$ret['certData'] = preg_replace('/\s+/', '', str_replace(array("\r", "\n"), '', $key['X509Certificate']));
 			break;
 		}
 
@@ -527,7 +527,7 @@ class SimpleSAML_Metadata_SAMLParser {
 			}
 
 			/* Add the certificate data to the metadata. Only the first certificate will be added. */
-			$ret['certData'] = str_replace(array("\r", "\n"), '', $key['X509Certificate']);
+			$ret['certData'] = preg_replace('/\s+/', '', str_replace(array("\r", "\n"), '', $key['X509Certificate']));
 			$ret['certFingerprint'][] = sha1($certData);
 			break;
 		}
@@ -612,7 +612,7 @@ class SimpleSAML_Metadata_SAMLParser {
 				continue;
 			}
 
-			$ret['certData'] = str_replace(array("\r", "\n"), '', $key['X509Certificate']);
+			$ret['certData'] = preg_replace('/\s+/', '', str_replace(array("\r", "\n"), '', $key['X509Certificate']));
 			break;
 		}
 
@@ -705,7 +705,7 @@ class SimpleSAML_Metadata_SAMLParser {
 			}
 
 			/* Add the certificate data to the metadata. Only the first certificate will be added. */
-			$ret['certData'] = str_replace(array("\r", "\n"), '', $key['X509Certificate']);
+			$ret['certData'] = preg_replace('/\s+/', '', str_replace(array("\r", "\n"), '', $key['X509Certificate']));
 			$ret['certFingerprint'][] = sha1($certData);
 			break;
 		}