diff --git a/ChangeLog b/ChangeLog
index 0720329..ab9ad8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-08-06  Glynn Foster  <glynn.foster@sun.com>
+
+	* cgi-bin/membership-form-handler.cgi: Add backend for new checkbox.
+	* membership-form.html: Add a new checkbox for previous foundation
+	member.
+
 2002-07-17 Steve Fox <drfickle@uberh4x0r.org>
 
 	* index.html
diff --git a/cgi-bin/membership-form-handler.cgi b/cgi-bin/membership-form-handler.cgi
index 3e09b7b..8740191 100755
--- a/cgi-bin/membership-form-handler.cgi
+++ b/cgi-bin/membership-form-handler.cgi
@@ -19,10 +19,17 @@ print $form->header;
 my $date = localtime;
 
 open MAIL, "|$MAIL_COMMAND";
-print MAIL <<END;
+print MAIL <<HEADER;
 From: gnome-membership\@gnome.org (GNOME Membership Script)
 To: membership\@gnome.org (GNOME Membership Committee)
-Subject: Application received from $FORM::name ($FORM::email)
+HEADER
+
+if ($FORM::previousmember == "on") {
+  print MAIL "Subject: [RENEWAL] Application received from $FORM::name ($FORM::email)";
+} else {
+  print MAIL "Subject: Application received from $FORM::name ($FORM::email)";
+}
+print MAIL <<END;
 
 Contact Information:
 --------------------
@@ -30,6 +37,7 @@ Name: $FORM::name
 E-mail: $FORM::email
 irc.gnome.org nickname (if any): $FORM::ircnick
 cvs.gnome.org username (if any): $FORM::cvsuser
+Previous GNOME Foundation member:  $FORM::previousmember
 
 GNOME contributions:
 --------------------
diff --git a/membership-form.html b/membership-form.html
index 25fbb46..3b5d7d5 100644
--- a/membership-form.html
+++ b/membership-form.html
@@ -66,6 +66,8 @@ href="mailto:membership@gnome.org">membership@gnome.org</a>.</p>
 length=50></td></tr>
 <tr><td>cvs.gnome.org username (if any):</td><td><input name="cvsuser"
 length=50></td></tr>
+<tr><td><input type="checkbox" name="previousmember"> Previous GNOME Foundation member
+</td></tr>
 </table>
 <h3>GNOME Contributions</h3>
 <p>Membership in the GNOME Foundation requires that the candidate has