diff --git a/Announce b/Announce
index 484412847d..5e54e35a9d 100755
--- a/Announce
+++ b/Announce
@@ -12,11 +12,15 @@ git rev-parse --verify "$previous" >/dev/null || exit $?
 case "$branch" in
 maint)
 	kind="maintenance" ;;
+mainto/*)
+	kind="obsolete maintenance" ;;
 master)
 	kind="feature" ;;
 esac
 
-cat <<EOF
+fmt -64 <<EOF
+Subject: [ANNOUNCE] GIT $vername
+
 The latest $kind release GIT $vername is available at the usual places:
 
 	http://www.kernel.org/pub/software/scm/git/
@@ -25,9 +29,7 @@ The latest $kind release GIT $vername is available at the usual places:
 	RPMS/\$arch/git-*-$vername-1.\$arch.rpm	(RPM)
 
 
-BLURB HERE
-BLURB HERE
-BLURB HERE
+BLURB HERE BLURB HERE BLURB HERE
 
 ----------------------------------------------------------------
 
diff --git a/TODO b/TODO
index b766239189..d7503d2875 100644
--- a/TODO
+++ b/TODO
@@ -140,6 +140,8 @@ Technical (trivial)
 * Daemon --base-path forbidding user-path automatically feels
   wrong.  If somebody cares enough, accept patches.
 
+* git-proxy should be spawned with sh -c 'command' $1 $2.
+
 * Versioning scheme.  The next maintenance installment will be
   1.0.3 not 1.0.0c.  The next feature release would be 1.1.0 [DONE].