diff --git a/src/SAML2/Certificate/Fingerprint.php b/src/SAML2/Certificate/Fingerprint.php
index 7cd9e54308..f42e4dc5df 100644
--- a/src/SAML2/Certificate/Fingerprint.php
+++ b/src/SAML2/Certificate/Fingerprint.php
@@ -6,6 +6,8 @@
 
 /**
  * Simple representation of the fingerprint of a certificate
+ *
+ * @deprecated Please use full certificates instead.
  */
 class Fingerprint
 {
@@ -16,6 +18,8 @@ class Fingerprint
 
     /**
      * @param string $fingerPrint
+     *
+     * @deprecated Please use full certificates instead.
      */
     public function __construct($fingerPrint)
     {
diff --git a/src/SAML2/Certificate/FingerprintCollection.php b/src/SAML2/Certificate/FingerprintCollection.php
index cf0e0e2535..1d80afcd89 100644
--- a/src/SAML2/Certificate/FingerprintCollection.php
+++ b/src/SAML2/Certificate/FingerprintCollection.php
@@ -7,6 +7,7 @@
 
 /**
  * Simple collection object for transporting keys
+ * @deprecated Please load full certificates instead.
  */
 class FingerprintCollection extends ArrayCollection
 {
@@ -14,6 +15,8 @@ class FingerprintCollection extends ArrayCollection
      * Add a key to the collection
      *
      * @param \SAML2\Certificate\Fingerprint $fingerprint
+     *
+     * @deprecated
      */
     public function add($fingerprint)
     {
@@ -31,6 +34,8 @@ public function add($fingerprint)
      * @param \SAML2\Certificate\Fingerprint $otherFingerprint
      *
      * @return bool
+     *
+     * @deprecated
      */
     public function contains(Fingerprint $otherFingerprint)
     {
diff --git a/src/SAML2/Certificate/FingerprintLoader.php b/src/SAML2/Certificate/FingerprintLoader.php
index 1e4ed2793c..d8d06710b9 100644
--- a/src/SAML2/Certificate/FingerprintLoader.php
+++ b/src/SAML2/Certificate/FingerprintLoader.php
@@ -4,7 +4,9 @@
 
 use SAML2\Configuration\CertificateProvider;
 use SAML2\Exception\InvalidArgumentException;
-
+/**
+ * @deprecated Please load full certificates instead.
+ */
 class FingerprintLoader
 {
     /**
@@ -13,6 +15,8 @@ class FingerprintLoader
      * @param \SAML2\Configuration\CertificateProvider $configuration
      *
      * @return \SAML2\Certificate\FingerprintCollection
+     *
+     * @deprecated
      */
     public static function loadFromConfiguration(CertificateProvider $configuration)
     {
@@ -27,6 +31,8 @@ public static function loadFromConfiguration(CertificateProvider $configuration)
      * @param \SAML2\Configuration\CertificateProvider $configuration
      *
      * @return \SAML2\Certificate\FingerprintCollection
+     *
+     * @deprecated
      */
     public function loadFingerprints(CertificateProvider $configuration)
     {
diff --git a/src/SAML2/Certificate/X509.php b/src/SAML2/Certificate/X509.php
index 904ab0f832..92ee24c9e9 100644
--- a/src/SAML2/Certificate/X509.php
+++ b/src/SAML2/Certificate/X509.php
@@ -50,6 +50,8 @@ public function getCertificate()
 
     /**
      * @return \SAML2\Certificate\Fingerprint
+     *
+     * @deprecated Please use full certificates instead.
      */
     public function getFingerprint()
     {
diff --git a/src/SAML2/Configuration/CertificateProvider.php b/src/SAML2/Configuration/CertificateProvider.php
index 849e2fceae..902d320c71 100644
--- a/src/SAML2/Configuration/CertificateProvider.php
+++ b/src/SAML2/Configuration/CertificateProvider.php
@@ -36,6 +36,8 @@ public function getCertificateFile();
      * fingerprint is a string containing the certificate fingerprint.
      *
      * @return null|array|\Traversable
+     *
+     * @deprecated Please use getCertifiateFile() or getCertificateData()
      */
     public function getCertificateFingerprints();
 }
diff --git a/src/SAML2/Configuration/IdentityProvider.php b/src/SAML2/Configuration/IdentityProvider.php
index 4c0d56e2ab..6c32283b73 100644
--- a/src/SAML2/Configuration/IdentityProvider.php
+++ b/src/SAML2/Configuration/IdentityProvider.php
@@ -25,6 +25,9 @@ public function getCertificateFile()
         return $this->get('certificateFile');
     }
 
+    /**
+     * @deprecated Please use getCertifiateFile() or getCertificateData()
+     */
     public function getCertificateFingerprints()
     {
         return $this->get('certificateFingerprints');
diff --git a/src/SAML2/Configuration/ServiceProvider.php b/src/SAML2/Configuration/ServiceProvider.php
index 59b88a0ae2..e71d0166f6 100644
--- a/src/SAML2/Configuration/ServiceProvider.php
+++ b/src/SAML2/Configuration/ServiceProvider.php
@@ -27,6 +27,9 @@ public function getCertificateFile()
         return $this->get('certificateFile');
     }
 
+    /**
+     * @deprecated Please use getCertificateData() or getCertificateFile().
+     */
     public function getCertificateFingerprints()
     {
         return $this->get('certificateFingerprints');
diff --git a/src/SAML2/Signature/FingerprintValidator.php b/src/SAML2/Signature/FingerprintValidator.php
index 1bb8b31851..828ea5a732 100644
--- a/src/SAML2/Signature/FingerprintValidator.php
+++ b/src/SAML2/Signature/FingerprintValidator.php
@@ -10,6 +10,8 @@
 
 /**
  * Validates the signature based on the fingerprint of the certificate
+ *
+ * @deprecated Please use full certificates instead.
  */
 class FingerprintValidator extends AbstractChainedValidator
 {
@@ -23,6 +25,9 @@ class FingerprintValidator extends AbstractChainedValidator
      */
     private $fingerprintLoader;
 
+    /**
+     * @deprecated Please use full certificates instead.
+     */
     public function __construct(
         LoggerInterface $logger,
         FingerprintLoader $fingerprintLoader
diff --git a/src/SAML2/SignedElementHelper.php b/src/SAML2/SignedElementHelper.php
index 5ba069890c..50de0cfe28 100644
--- a/src/SAML2/SignedElementHelper.php
+++ b/src/SAML2/SignedElementHelper.php
@@ -175,7 +175,7 @@ public function getValidatingCertificates()
         $ret = array();
         foreach ($this->certificates as $cert) {
 
-            /* We have found a matching fingerprint. */
+            /* Construct a PEM formatted certificate */
             $pemCert = "-----BEGIN CERTIFICATE-----\n" .
                 chunk_split($cert, 64) .
                 "-----END CERTIFICATE-----\n";