diff --git a/configure.in b/configure.in
index c27bf2b..6b9f3de 100644
--- a/configure.in
+++ b/configure.in
@@ -41,9 +41,9 @@ foundation.gnome.org/finance/Makefile
 foundation.gnome.org/membership/Makefile
 foundation.gnome.org/news/Makefile
 foundation.gnome.org/referenda/Makefile
-foundation.gnome.org/referenda/2004-10/Makefile
-foundation.gnome.org/referenda/2005-10/Makefile
 foundation.gnome.org/reports/Makefile
 foundation.gnome.org/vote/Makefile
 foundation.gnome.org/vote/include/Makefile
+foundation.gnome.org/vote/2004-10/Makefile
+foundation.gnome.org/vote/2005-10/Makefile
 ])
diff --git a/foundation.gnome.org/news/index.wml b/foundation.gnome.org/news/index.wml
index b5a3c6c..c8fe1fd 100644
--- a/foundation.gnome.org/news/index.wml
+++ b/foundation.gnome.org/news/index.wml
@@ -483,9 +483,9 @@
         <small>(20/10/2005)</small>
         <blockquote>
           The GNOME Foundation will hold a <a
-          href="../referenda/2005-10/">referendum</a> about reducing the board
+          href="../vote/2005-10/">referendum</a> about reducing the board
           size. Take a look at the <a
-          href="../referenda/2005-10/rules.html">rules and the timeline</a>.
+          href="../vote/2005-10/rules.html">rules and the timeline</a>.
         </blockquote>
       </li>
       <li>
@@ -538,8 +538,8 @@
         <small>(11/10/2004)</small>
         <blockquote>
           The preliminary results of the anonymous voting referendum have been
-          <a href="../referenda/2004-10/preliminary-results.html">posted</a>.
-          You can <a href="../referenda/2004-10/verify.html">verify the results</a>
+          <a href="../vote/2004-10/preliminary-results.html">posted</a>.
+          You can <a href="../vote/2004-10/verify.html">verify the results</a>
           yourself.
           Any challenges to these results must be received by October 22nd.
         </blockquote>
@@ -549,9 +549,9 @@
         <small>(14/09/2004)</small>
         <blockquote>
           The GNOME Foundation will hold a <a
-          href="../referenda/2004-10/">referendum</a> about anonymous voting
+          href="../vote/2004-10/">referendum</a> about anonymous voting
           in a few weeks. Take a look at the <a
-          href="../referenda/2004-10/rules.html">rules and the timeline</a>.
+          href="../vote/2004-10/rules.html">rules and the timeline</a>.
         </blockquote>
       </li>
       <li>
diff --git a/foundation.gnome.org/referenda/Makefile.am b/foundation.gnome.org/referenda/Makefile.am
index fdd3de9..6c6c4ba 100644
--- a/foundation.gnome.org/referenda/Makefile.am
+++ b/foundation.gnome.org/referenda/Makefile.am
@@ -1,5 +1,3 @@
-SUBDIRS = 2004-10 2005-10
-
 urlpath = /referenda
 
 page_SCRIPTS = \
diff --git a/foundation.gnome.org/vote/2005-10/index.wml b/foundation.gnome.org/vote/2005-10/index.wml
index 561f510..f256965 100644
--- a/foundation.gnome.org/vote/2005-10/index.wml
+++ b/foundation.gnome.org/vote/2005-10/index.wml
@@ -63,7 +63,7 @@
       </li>
       <li>
         <a href="rules.html">Referendum Rules and Timeline</a> (webcal <a
-        href="webcal://foundation.gnome.org/referenda/2005-10/timeline.ics">timeline</a>)
+        href="webcal://foundation.gnome.org/vote/2005-10/timeline.ics">timeline</a>)
       </li>
       <li>
         <a href="http://mail.gnome.org/archives/foundation-list/2005-September/msg00082.html">Original discussion about reducing the board size</a>