diff -ur ssmtp-2.61/INSTALL ssmtp-2.61-local/INSTALL
--- ssmtp-2.61/INSTALL	2004-05-15 16:31:21.000000000 -0500
+++ ssmtp-2.61-local/INSTALL	2006-01-06 18:57:00.000000000 -0500
@@ -57,7 +57,7 @@
 		records don't count, as several vendors' machines that we
 		run ssmtp on (notably suns) don't fully support them.
 		They'd be nice, though...
-	rewriteDomain: The place to say the mail came from. This is for
+	rewriteDomain: The place to say where the mail came from. This is for
 		hostname-hiding, and only applies if the programs is
 		compiled with REWRITE_DOMAIN defined. We don't usually have
 		to do so (our main mailhubs run zmailer: our clients run all
diff -ur ssmtp-2.61/ssmtp.c ssmtp-2.61-local/ssmtp.c
--- ssmtp-2.61/ssmtp.c	2004-07-23 00:58:48.000000000 -0500
+++ ssmtp-2.61-local/ssmtp.c	2006-01-06 19:23:15.000000000 -0500
@@ -727,7 +727,7 @@
 void header_parse(FILE *stream)
 {
 	size_t size = BUF_SZ, len = 0;
-	char *p = (char *)NULL, *q;
+	char *p = (char *)NULL, *q = (p + len);
 	bool_t in_header = True;
 	char l = (char)NULL;
 	int c;
@@ -982,7 +982,7 @@
 #ifdef INET6
 	struct addrinfo hints, *ai0, *ai;
 	char servname[NI_MAXSERV];
-	int s;
+	int s = 0;
 #else
 	struct sockaddr_in name;
 	struct hostent *hent;