diff --git a/ChangeLog b/ChangeLog
index b81e499..3503d57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-19  Vincent Untz  <vuntz@gnome.org>
+
+	* foundation.gnome.org/membership/application.wml: try to add an
+	antispam entry
+
 2006-04-01  Vincent Untz  <vuntz@gnome.org>
 
 	* foundation.gnome.org/membership/application.wml: accept + in email
diff --git a/foundation.gnome.org/membership/application.wml b/foundation.gnome.org/membership/application.wml
index 4f5b6d7..d1b6716 100644
--- a/foundation.gnome.org/membership/application.wml
+++ b/foundation.gnome.org/membership/application.wml
@@ -24,6 +24,7 @@
   $ircnick = $_POST['ircnick'];
   $cvsuser = $_POST['cvsuser'];
   $previousmember = $_POST['previousmember'];
+  $spam = $_POST['spam'];
 
   if ($submit) {
       /* remove the slashes */
@@ -58,6 +59,11 @@
         }
       }
 
+      if ($spam != "not spam") {
+        $bad_elements[] = "spam";
+        $errors[] = "Please fill the \"not spam\" field.";
+      }
+
       if (count($bad_elements) == 0) {
         // make the mail
 
@@ -267,6 +273,15 @@
       <p>
       <textarea name="comments" rows="10" cols="50"><?php if ($comments) { echo $comments; } ?></textarea>
       </p>
+
+      <table summary="Antispam form">
+        <tr>
+          <td>Please type "not spam" here:</td>
+          <td>
+            <input type="text" name="spam" size="20" value="" />
+          </td>
+        </tr>
+      </table>
       
       <p>
         <div class="center">