diff --git a/modules/saml2/lib/Message.php b/modules/saml2/lib/Message.php
index 9148d7271514d2ab9a3453b606a07a9ea8fdd364..8c7ffa06072189d06c623357af5ed34b6f43a0b3 100644
--- a/modules/saml2/lib/Message.php
+++ b/modules/saml2/lib/Message.php
@@ -388,6 +388,11 @@ class sspmod_saml2_Message {
 		$ar->setForceAuthn($spMetadata->getBoolean('ForceAuthn', FALSE));
 		$ar->setIsPassive($spMetadata->getBoolean('IsPassive', FALSE));
 
+		if ($spMetadata->hasValue('AuthnContextClassRef')) {
+			$accr = $spMetadata->getArrayizeString('AuthnContextClassRef');
+			$ar->setRequestedAuthnContext(array('AuthnContextClassRef' => $accr));
+		}
+
 		self::addRedirectSign($spMetadata, $idpMetadata, $ar);
 
 		return $ar;