diff --git a/www/saml2/idp/metadata.php b/www/saml2/idp/metadata.php
index cf24b788f1..9c373a7117 100644
--- a/www/saml2/idp/metadata.php
+++ b/www/saml2/idp/metadata.php
@@ -182,7 +182,8 @@
 
 	} else {
 
-		header('Content-Type: application/xml');
+		header('Content-Type: application/samlmetadata+xml');
+		header('Content-Disposition: attachment; filename=' . $idpmeta->getString('host') . '-IdP.xml');
 
 		echo $metaxml;
 		exit(0);