diff --git a/proto/signer.proto b/proto/signer.proto
index 65ae950ff8..5278bc26cb 100644
--- a/proto/signer.proto
+++ b/proto/signer.proto
@@ -46,7 +46,8 @@ message PublicKey {
 // Signature specifies a KeyInfo that was used for signing and signed content
 message Signature {
   KeyInfo keyInfo = 1;
-  bytes content = 2;
+  Algorithm algorithm = 2;
+  bytes content = 3;
 }
 
 // SignatureRequests specifies a KeyInfo, and content to be signed
diff --git a/signer/api/rpc_api.go b/signer/api/rpc_api.go
index af72f62933..67f2183f67 100644
--- a/signer/api/rpc_api.go
+++ b/signer/api/rpc_api.go
@@ -113,7 +113,8 @@ func (s *SignerServer) Sign(ctx context.Context, sr *pb.SignatureRequest) (*pb.S
 			KeyID:     &pb.KeyID{ID: tufKey.ID()},
 			Algorithm: &pb.Algorithm{Algorithm: tufKey.Algorithm().String()},
 		},
-		Content: signatures[0].Signature,
+		Algorithm: signatures[0].Method,
+		Content:   signatures[0].Signature,
 	}
 
 	return signature, nil
diff --git a/signer/signer_trust.go b/signer/signer_trust.go
index d5856c1de3..5824b299c2 100644
--- a/signer/signer_trust.go
+++ b/signer/signer_trust.go
@@ -54,7 +54,7 @@ func (trust *NotarySigner) Sign(keyIDs []string, toSign []byte) ([]data.Signatur
 		}
 		signatures = append(signatures, data.Signature{
 			KeyID:     sig.KeyInfo.KeyID.ID,
-			Method:    data.SigAlgorithm(sig.KeyInfo.Algorithm.Algorithm),
+			Method:    data.SigAlgorithm(sig.Algorithm.Algorithm),
 			Signature: sig.Content,
 		})
 	}