diff --git a/openpgp/clearsign/clearsign.go b/openpgp/clearsign/clearsign.go
index 90bb9fc2..aea7f95b 100644
--- a/openpgp/clearsign/clearsign.go
+++ b/openpgp/clearsign/clearsign.go
@@ -173,6 +173,7 @@ func Decode(data []byte) (b *Block, rest []byte) {
 		b.Plaintext = append(b.Plaintext, line...)
 		b.Plaintext = append(b.Plaintext, lf)
 	}
+	b.Plaintext = b.Plaintext[:len(b.Plaintext)-1]
 
 	// We want to find the extent of the armored data (including any newlines at
 	// the end).
diff --git a/openpgp/clearsign/clearsign_test.go b/openpgp/clearsign/clearsign_test.go
index 0e93c864..ef6242f1 100644
--- a/openpgp/clearsign/clearsign_test.go
+++ b/openpgp/clearsign/clearsign_test.go
@@ -58,8 +58,8 @@ func testParse(t *testing.T, input []byte, expected, expectedPlaintext string) {
 }
 
 func TestParse(t *testing.T) {
-	testParse(t, clearsignInput, "Hello world\r\nline 2", "Hello world\nline 2\n")
-	testParse(t, clearsignInput2, "\r\n\r\n(This message has a couple of blank lines at the start and end.)\r\n\r\n", "\n\n(This message has a couple of blank lines at the start and end.)\n\n\n")
+	testParse(t, clearsignInput, "Hello world\r\nline 2", "Hello world\nline 2")
+	testParse(t, clearsignInput2, "\r\n\r\n(This message has a couple of blank lines at the start and end.)\r\n\r\n", "\n\n(This message has a couple of blank lines at the start and end.)\n\n")
 }
 
 func TestParseWithNoNewlineAtEnd(t *testing.T) {
@@ -77,21 +77,21 @@ func TestParseWithNoNewlineAtEnd(t *testing.T) {
 var signingTests = []struct {
 	in, signed, plaintext string
 }{
-	{"", "", "\n"},
-	{"a", "a", "a\n"},
-	{"a\n", "a\r\n", "a\n\n"},
-	{"-a\n", "-a\r\n", "-a\n\n"},
-	{"--a\nb", "--a\r\nb", "--a\nb\n"},
+	{"", "", ""},
+	{"a", "a", "a"},
+	{"a\n", "a\r\n", "a\n"},
+	{"-a\n", "-a\r\n", "-a\n"},
+	{"--a\nb", "--a\r\nb", "--a\nb"},
 	// leading whitespace
-	{" a\n", " a\r\n", " a\n\n"},
-	{"  a\n", "  a\r\n", "  a\n\n"},
+	{" a\n", " a\r\n", " a\n"},
+	{"  a\n", "  a\r\n", "  a\n"},
 	// trailing whitespace (should be stripped)
-	{"a \n", "a\r\n", "a\n\n"},
-	{"a ", "a", "a\n"},
-	{"  \n", "\r\n", "\n\n"},
-	{"  ", "", "\n"},
-	{"a\n  \n  \nb\n", "a\r\n\r\n\r\nb\r\n", "a\n\n\nb\n\n"},
-	{"a\n  \n  \nb\n", "a\r\n\r\n\r\nb\r\n", "a\n\n\nb\n\n"},
+	{"a \n", "a\r\n", "a\n"},
+	{"a ", "a", "a"},
+	{"  \n", "\r\n", "\n"},
+	{"  ", "", ""},
+	{"a\n  \n  \nb\n", "a\r\n\r\n\r\nb\r\n", "a\n\n\nb\n"},
+	{"a\n  \n  \nb\n", "a\r\n\r\n\r\nb\r\n", "a\n\n\nb\n"},
 }
 
 func TestVerifyV6(t *testing.T) {