diff --git a/foundation.gnome.org/htaccess b/foundation.gnome.org/htaccess
index ac5664f..f008a5f 100644
--- a/foundation.gnome.org/htaccess
+++ b/foundation.gnome.org/htaccess
@@ -24,34 +24,34 @@ Redirect /board_of_directors.html	http://foundation.gnome.org/about/
 Redirect /executive_director.html	http://foundation.gnome.org/about/
 
 # Move of the elections stuff in subdirectories
-Redirect /announcement.html		http://foundation.gnome.org/elections/2000/announcement.html
-Redirect /ballot-summary-2000.html	http://foundation.gnome.org/elections/2000/candidates.html
-Redirect /ballot-summary-2001.html	http://foundation.gnome.org/elections/2001/candidates.html
-Redirect /ballot-summary.html		http://foundation.gnome.org/elections/2002/candidates.html
-Redirect /election-2000.html		http://foundation.gnome.org/elections/2000/
-Redirect /election-2001.html		http://foundation.gnome.org/elections/2001/
-Redirect /electionresults.html		http://foundation.gnome.org/elections/2000/results.html
-Redirect /electionrules-2000.html	http://foundation.gnome.org/elections/2000/rules.html
-Redirect /electionrules-2001.html	http://foundation.gnome.org/elections/2001/rules.html
-Redirect /electionrules.html		http://foundation.gnome.org/elections/2010/rules.html
-Redirect /elections.html		http://foundation.gnome.org/elections/
-Redirect /final-vote-archive.diff	http://foundation.gnome.org/elections/2000/vote-archives.diff
-Redirect /final_membership_list.txt	http://foundation.gnome.org/elections/2000/registered-voters.txt
-Redirect /list-addresses.py		http://foundation.gnome.org/elections/2000/list-addresses.py
-Redirect /vote-counter.py		http://foundation.gnome.org/elections/2000/vote-counter.py
-Redirect /voters-2000.html		http://foundation.gnome.org/elections/2000/voters.html
-Redirect /voters-2001.html		http://foundation.gnome.org/elections/2001/voters.html
-Redirect /voters.html			http://foundation.gnome.org/elections/2002/voters.html
-Redirect /elections/2001-eligible-members.txt	http://foundation.gnome.org/elections/2001/registered-voters.txt
-Redirect /elections/2001-prelim-results.txt	http://foundation.gnome.org/elections/2001/results.txt
-Redirect /elections/2001-vote-archive.diff	http://foundation.gnome.org/elections/2001/vote-archives.diff
-Redirect /elections/list-addresses.py	http://foundation.gnome.org/elections/2001/list-addresses.py
-Redirect /elections/verify.html		http://foundation.gnome.org/elections/2001/verify.html
-Redirect /elections/vote-counter.py	http://foundation.gnome.org/elections/2001/vote-counter.py
-Redirect /overview.html			http://foundation.gnome.org/elections/overview.html
-Redirect /overview_2000.html		http://foundation.gnome.org/elections/overview.html
-Redirect /elections/2002/preliminary_results.html       http://foundation.gnome.org/elections/2002/preliminary-results.html
-RewriteRule elections/200./overview.html	http://foundation.gnome.org/elections/overview.html [R]
+Redirect /announcement.html		http://foundation.gnome.org/vote/2000/announcement.html
+Redirect /ballot-summary-2000.html	http://foundation.gnome.org/vote/2000/candidates.html
+Redirect /ballot-summary-2001.html	http://foundation.gnome.org/vote/2001/candidates.html
+Redirect /ballot-summary.html		http://foundation.gnome.org/vote/2002/candidates.html
+Redirect /election-2000.html		http://foundation.gnome.org/vote/2000/
+Redirect /election-2001.html		http://foundation.gnome.org/vote/2001/
+Redirect /electionresults.html		http://foundation.gnome.org/vote/2000/results.html
+Redirect /electionrules-2000.html	http://foundation.gnome.org/vote/2000/rules.html
+Redirect /electionrules-2001.html	http://foundation.gnome.org/vote/2001/rules.html
+Redirect /electionrules.html		http://foundation.gnome.org/vote/2010/rules.html
+Redirect /elections.html		http://foundation.gnome.org/vote/
+Redirect /final-vote-archive.diff	http://foundation.gnome.org/vote/2000/vote-archives.diff
+Redirect /final_membership_list.txt	http://foundation.gnome.org/vote/2000/registered-voters.txt
+Redirect /list-addresses.py		http://foundation.gnome.org/vote/2000/list-addresses.py
+Redirect /vote-counter.py		http://foundation.gnome.org/vote/2000/vote-counter.py
+Redirect /voters-2000.html		http://foundation.gnome.org/vote/2000/voters.html
+Redirect /voters-2001.html		http://foundation.gnome.org/vote/2001/voters.html
+Redirect /voters.html			http://foundation.gnome.org/vote/2002/voters.html
+Redirect /elections/2001-eligible-members.txt	http://foundation.gnome.org/vote/2001/registered-voters.txt
+Redirect /elections/2001-prelim-results.txt	http://foundation.gnome.org/vote/2001/results.txt
+Redirect /elections/2001-vote-archive.diff	http://foundation.gnome.org/vote/2001/vote-archives.diff
+Redirect /elections/list-addresses.py	http://foundation.gnome.org/vote/2001/list-addresses.py
+Redirect /elections/verify.html		http://foundation.gnome.org/vote/2001/verify.html
+Redirect /elections/vote-counter.py	http://foundation.gnome.org/vote/2001/vote-counter.py
+Redirect /overview.html			http://foundation.gnome.org/vote/overview.html
+Redirect /overview_2000.html		http://foundation.gnome.org/vote/overview.html
+Redirect /elections/2002/preliminary_results.html       http://foundation.gnome.org/vote/2002/preliminary-results.html
+RewriteRule elections/200./overview.html	http://foundation.gnome.org/vote/overview.html [R]
 
 # Move of the press releases
 Redirect /press.html			http://www.gnome.org/press/