diff --git a/lib/diaspora_federation/salmon/encrypted_slap.rb b/lib/diaspora_federation/salmon/encrypted_slap.rb
index 278cfeb..0c8e1ff 100644
--- a/lib/diaspora_federation/salmon/encrypted_slap.rb
+++ b/lib/diaspora_federation/salmon/encrypted_slap.rb
@@ -63,6 +63,7 @@ module DiasporaFederation
     #
     #   entity = slap.entity(author_pubkey)
     #
+    # @deprecated
     class EncryptedSlap < Slap
       # the key and iv if it is an encrypted slap
       # @param [Hash] value hash containing the key and iv
diff --git a/lib/diaspora_federation/salmon/exceptions.rb b/lib/diaspora_federation/salmon/exceptions.rb
index 649b9a6..853d12b 100644
--- a/lib/diaspora_federation/salmon/exceptions.rb
+++ b/lib/diaspora_federation/salmon/exceptions.rb
@@ -1,18 +1,22 @@
 module DiasporaFederation
   module Salmon
     # Raised, if the element containing the Magic Envelope is missing from the XML
+    # @deprecated
     class MissingMagicEnvelope < RuntimeError
     end
 
     # Raised, if the element containing the author is empty.
+    # @deprecated
     class MissingAuthor < RuntimeError
     end
 
     # Raised, if the element containing the header is missing from the XML
+    # @deprecated
     class MissingHeader < RuntimeError
     end
 
     # Raised if the decrypted header has an unexpected XML structure
+    # @deprecated
     class InvalidHeader < RuntimeError
     end
 
diff --git a/lib/diaspora_federation/salmon/slap.rb b/lib/diaspora_federation/salmon/slap.rb
index 9cb8c2e..57d4630 100644
--- a/lib/diaspora_federation/salmon/slap.rb
+++ b/lib/diaspora_federation/salmon/slap.rb
@@ -25,6 +25,8 @@ module DiasporaFederation
     #   author_pubkey = however_you_retrieve_the_authors_public_key(slap.author_id)
     #
     #   entity = slap.entity(author_pubkey)
+    #
+    # @deprecated
     class Slap
       # the author of the slap
       # @overload author_id