diff -Nru spamass-milter-0.3.2/debian/changelog spamass-milter-0.3.2/debian/changelog
--- spamass-milter-0.3.2/debian/changelog	2012-06-26 19:51:31.000000000 +0200
+++ spamass-milter-0.3.2/debian/changelog	2016-03-05 12:22:53.000000000 +0100
@@ -1,3 +1,9 @@
+spamass-milter (0.3.2-1.1) UNRELEASED; urgency=medium
+
+  * Fix format of Received: header (closes: #775183)
+
+ -- Claus Färber <cfaerber@cfaerber.name>  Sat, 05 Mar 2016 12:11:51 +0100
+
 spamass-milter (0.3.2-1) unstable; urgency=low
 
   * New upstream release
diff -Nru spamass-milter-0.3.2/debian/patches/auth_in_received spamass-milter-0.3.2/debian/patches/auth_in_received
--- spamass-milter-0.3.2/debian/patches/auth_in_received	2012-06-21 23:15:15.000000000 +0200
+++ spamass-milter-0.3.2/debian/patches/auth_in_received	2016-03-05 12:23:45.000000000 +0100
@@ -3,10 +3,8 @@
 Bug: #627989
 Author: Herbert Straub, Knut Arne Bjørndal <knut.arne.bjorndal@easyconnect.no>
 Forwarded: no
-Index: spamass-milter/spamass-milter.cpp
-===================================================================
---- spamass-milter.orig/spamass-milter.cpp	2012-06-21 13:03:42.000000000 -0700
-+++ spamass-milter/spamass-milter.cpp	2012-06-21 14:02:32.000000000 -0700
+--- a/spamass-milter.cpp
++++ b/spamass-milter.cpp
 @@ -898,7 +898,8 @@
  		   
  		*/
@@ -48,6 +46,8 @@
 -		assassin->output((string)
 -			"Received: from "+macro_s+" ("+macro__+")\r\n\t"+
 -			"by "+macro_j+" ("+macro_v+"/"+macro_Z+") with "+macro_r+" id "+macro_i+"\r\n\t"+
+-			macro_b+"\r\n\t"+
+-			"(envelope-from "+assassin->from()+")\r\n");
 +		string rec_header;
 +		rec_header=(string)"Received: from "+macro_s+" ("+macro__+")\r\n\t";
 +		if (strlen(macro_auth_type)!=0) {
@@ -57,11 +57,10 @@
 +			}
 +			rec_header+=(string)")\r\n\t";
 +		}
-+		rec_header+=(string)"by "+macro_j+"("+macro_v+"/"+macro_Z+") with "+
++		rec_header+=(string)"by "+macro_j+" ("+macro_v+"/"+macro_Z+") with "+
 +			macro_r+" id "+macro_i+"\r\n\t"+
- 			macro_b+"\r\n\t"+
--			"(envelope-from "+assassin->from()+")\r\n");
-+			"(envelope-from "+assassin->from()+"\r\n";
++			"(envelope-from "+assassin->from()+");\r\n\t"+
++			macro_b+"\r\n";
 +
 +		debug(D_SPAMC, "Received header for spamc: %s", rec_header.c_str());
 +		assassin->output(rec_header);