diff --git a/ChangeLog b/ChangeLog
index c308461..79cc026 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-11-13 Vincent Untz
+
+ Make the membership list dynamic.
+
+ * foundation.gnome.org/htaccess: updated for the move of the list
+ * foundation.gnome.org/membership/.cvsignore: updated
+ * foundation.gnome.org/membership/Makefile.am: updated
+ * foundation.gnome.org/membership/index.wml: fix link
+ * foundation.gnome.org/membership/members.wml: use some PHP magic
+
+ * foundation.gnome.org/vote/vote.wml: fix some tags for xhtml
+
2005-11-09 Murray Cumming
* foundation.gnome.org/licensing/guidelines/index.wml:
diff --git a/foundation.gnome.org/htaccess b/foundation.gnome.org/htaccess
index 0b67cc4..f9dcd5c 100644
--- a/foundation.gnome.org/htaccess
+++ b/foundation.gnome.org/htaccess
@@ -9,7 +9,8 @@ Redirect /bylaws.pdf http://foundation.gnome.org/about/bylaws.pdf
# Move of the membership stuff
Redirect /membership.html http://foundation.gnome.org/membership/
-Redirect /membership-list.html http://foundation.gnome.org/membership/members.html
+Redirect /membership-list.html http://foundation.gnome.org/membership/members.php
+Redirect /membership/members.html http://foundation.gnome.org/membership/members.php
Redirect /membership-policy.html http://foundation.gnome.org/membership/
Redirect /membership-form.html http://foundation.gnome.org/membership/application.php
Redirect /membership-form.php http://foundation.gnome.org/membership/application.php
diff --git a/foundation.gnome.org/membership/.cvsignore b/foundation.gnome.org/membership/.cvsignore
index 7b6570b..fbddedc 100644
--- a/foundation.gnome.org/membership/.cvsignore
+++ b/foundation.gnome.org/membership/.cvsignore
@@ -1,4 +1,4 @@
-members.html
+members.php
application.php
index.html
Makefile.in
diff --git a/foundation.gnome.org/membership/Makefile.am b/foundation.gnome.org/membership/Makefile.am
index 964a039..97632bb 100644
--- a/foundation.gnome.org/membership/Makefile.am
+++ b/foundation.gnome.org/membership/Makefile.am
@@ -4,7 +4,7 @@ urlpath = /membership
page_SCRIPTS = \
index.html \
- members.html \
+ members.php \
application.php
include $(top_srcdir)/rules.common
diff --git a/foundation.gnome.org/membership/index.wml b/foundation.gnome.org/membership/index.wml
index 82bdd92..9585368 100644
--- a/foundation.gnome.org/membership/index.wml
+++ b/foundation.gnome.org/membership/index.wml
@@ -17,7 +17,7 @@
for election to the Board of Directors, vote in the elections for the
Board of Directors, and suggest referenda. The membership process is
overseen by the Membership and Elections Committee. You can also browse
- the current membership list.
+ the current membership list.
diff --git a/foundation.gnome.org/membership/members.wml b/foundation.gnome.org/membership/members.wml
index ab6d787..c2badd0 100644
--- a/foundation.gnome.org/membership/members.wml
+++ b/foundation.gnome.org/membership/members.wml
@@ -16,9 +16,70 @@
href="mailto:membership-committee@gnome.org">membership-committee@gnome.org.
-
- The list is currently being rebuilt. Please retry later.
-
+Error: ".$error.".\n";
+} else {
+ echo " \n";
+ $antispam = array(".", "@");
+
+ foreach ($members as $member) {
+ $email = str_replace($antispam, "", $member["email"]);
+ echo " - ".$member["firstname"]." ".$member["lastname"]." <".$email.">
\n";
+ }
+ echo "
\n";
+}
+?>