diff --git a/CodeOfConduct.html b/CodeOfConduct.html
index 917a7ec..34ed17f 100644
--- a/CodeOfConduct.html
+++ b/CodeOfConduct.html
@@ -18,11 +18,11 @@
 
 <UL>
 <br>
-<A HREF="http://geda-project.org/wiki/geda:screenshots"><b>Screenshots</b></A> &middot;
-<A HREF="http://geda-project.org/wiki"><b>Documentation</b></A> &middot;
-<A HREF="http://geda-project.org/wiki/geda:download"><b>Download</b></A> &middot;
+<A HREF="http://wiki.geda-project.org/geda:screenshots"><b>Screenshots</b></A> &middot;
+<A HREF="http://wiki.geda-project.org"><b>Documentation</b></A> &middot;
+<A HREF="http://wiki.geda-project.org/geda:download"><b>Download</b></A> &middot;
 <A HREF="./search.html"><b>Search</b></A> &middot;
-<A HREF="http://geda-project.org/wiki/geda:links"><b>Links</b></A>
+<A HREF="http://wiki.geda-project.org/geda:links"><b>Links</b></A>
 </UL>
 
 <div id="navundertext">
diff --git a/index.html b/index.html
index efc15b0..696d739 100644
--- a/index.html
+++ b/index.html
@@ -22,11 +22,11 @@
 
 <UL>
 <BR>
-<A HREF="http://geda-project.org/wiki/geda:screenshots"><b>Screenshots</b></A> &middot;
-<A HREF="http://geda-project.org/wiki"><b>Documentation</b></A> &middot;
-<A HREF="http://geda-project.org/wiki/geda:download"><b>Download</b></A> &middot;
+<A HREF="http://wiki.geda-project.org/geda:screenshots"><b>Screenshots</b></A> &middot;
+<A HREF="http://wiki.geda-project.org"><b>Documentation</b></A> &middot;
+<A HREF="http://wiki.geda-project.org/geda:download"><b>Download</b></A> &middot;
 <A HREF="./search.html"><b>Search</b></A> &middot;
-<A HREF="http://geda-project.org/wiki/geda:links"><b>Links</b></A> 
+<A HREF="http://wiki.geda-project.org/geda:links"><b>Links</b></A> 
 </UL>
 
 <div id="navundertext">
@@ -91,17 +91,17 @@ sure to visit <a HREF="http://www.opencollector.org">Open Collector</a>.
 
 <p>
 Please read the <A
-HREF="http://geda-project.org/wiki/geda:faq">FAQ</A> and this <A
-HREf="http://geda-project.org/wiki/geda:gsch2pcb_tutorial">tutorial</A>.
+HREF="http://wiki.geda-project.org/geda:faq">FAQ</A> and this <A
+HREf="http://wiki.geda-project.org/geda:gsch2pcb_tutorial">tutorial</A>.
 For even more information on installing and using gEDA, please look at the
-<A HREF="http://geda-project.org/wiki">gEDA Wiki</A>. Users looking for more symbols and footprints should go to the <A HREF="http://www.gedasymbols.org">gedasymbols.org</A> website.
+<A HREF="http://wiki.geda-project.org">gEDA Wiki</A>. Users looking for more symbols and footprints should go to the <A HREF="http://www.gedasymbols.org">gedasymbols.org</A> website.
 </p>
 
 <H2> Wiki </H2>
 
 <p>
-Please visit the <A HREF="http://geda-project.org/wiki">gEDA wiki</A>
-for more <A HREF="http://geda-project.org/wiki#faqs_quick_reference">FAQs</A>, the official <A HREF="http://geda-project.org/wiki/geda:documentation">documentation</A>, <A HREF="http://geda-project.org/wiki/geda:mailinglists">mailing lists</A> info, <A HREF="http://geda-project.org/wiki/geda:license">licensing</A> details, <A HREF="http://geda-project.org/wiki#developer_documentation">developer</A> documentation.
+Please visit the <A HREF="http://wiki.geda-project.org">gEDA wiki</A>
+for more <A HREF="http://wiki.geda-project.org#faqs_quick_reference">FAQs</A>, the official <A HREF="http://wiki.geda-project.org/geda:documentation">documentation</A>, <A HREF="http://wiki.geda-project.org/geda:mailinglists">mailing lists</A> info, <A HREF="http://wiki.geda-project.org/geda:license">licensing</A> details, <A HREF="http://wiki.geda-project.org#developer_documentation">developer</A> documentation.
 </p>
 
 </div>
@@ -112,7 +112,7 @@ for more <A HREF="http://geda-project.org/wiki#faqs_quick_reference">FAQs</A>, t
 <table align=left class=iconbar border=1 cellspacing=0 cellpadding=3 >
 <tr><td bgcolor="#ddddff" align=center><small><b>member<br>projects</b></small></td></tr>
 <tr><td align=center>
-<A HREF="http://geda-project.org/wiki/geda:gaf"><img border="0" title="Schematic capture and netlisting" src="./graphics/gaf-icon.png"></A><br>
+<A HREF="http://wiki.geda-project.org/geda:gaf"><img border="0" title="Schematic capture and netlisting" src="./graphics/gaf-icon.png"></A><br>
 <A HREF="http://pcb.geda-project.org/"><img border="0" title="Layout editor" src="./graphics/pcb-icon.png"></A><br>
 <A HREF="http://gedasymbols.org/"><img border="0" title="Symbol and footprint library" src="./graphics/gedasymbols-icon.png"></A><br>
 <A HREF="http://gerbv.geda-project.org/"><img border="0" title="Gerber viewer" src="./graphics/gerbv-icon.png"></A><br>
diff --git a/news/news2002.html b/news/news2002.html
index 7f6771f..4b50fba 100644
--- a/news/news2002.html
+++ b/news/news2002.html
@@ -25,7 +25,7 @@
 <li> <A HREF="../license.html">License</A> </li> <li> &middot; </li>
 <li> <A HREF="../download.html">Download</A> </li> 
 <br>
-<li> <A HREF="http://geda-project.org/wiki">Documentation</A> </li> <li> &middot; </li>
+<li> <A HREF="http://wiki.geda-project.org">Documentation</A> </li> <li> &middot; </li>
 <li> <A HREF="../mailinglists.html">Mailing Lists</A> </li> <li> &middot; </li>
 <li> <A HREF="../developer.html">Developer</A> </li> <li> &middot; </li>
 <li> <A HREF="../search.html">Search</A> </li> <li> &middot; </li>
diff --git a/news/news2003.html b/news/news2003.html
index 7c6adad..ecbbaa0 100644
--- a/news/news2003.html
+++ b/news/news2003.html
@@ -24,7 +24,7 @@
 <li> <A HREF="../license.html">License</A> </li> <li> &middot; </li>
 <li> <A HREF="../download.html">Download</A> </li> 
 <br>
-<li> <A HREF="http://geda-project.org/wiki">Documentation</A> </li> <li> &middot; </li>
+<li> <A HREF="http://wiki.geda-project.org">Documentation</A> </li> <li> &middot; </li>
 <li> <A HREF="../mailinglists.html">Mailing Lists</A> </li> <li> &middot; </li>
 <li> <A HREF="../developer.html">Developer</A> </li> <li> &middot; </li>
 <li> <A HREF="../search.html">Search</A> </li> <li> &middot; </li>
diff --git a/news/news2004.html b/news/news2004.html
index 1c6b656..6331a84 100644
--- a/news/news2004.html
+++ b/news/news2004.html
@@ -24,7 +24,7 @@
 <li> <A HREF="../license.html">License</A> </li> <li> &middot; </li>
 <li> <A HREF="../download.html">Download</A> </li> 
 <br>
-<li> <A HREF="http://geda-project.org/wiki">Documentation</A> </li> <li> &middot; </li>
+<li> <A HREF="http://wiki.geda-project.org">Documentation</A> </li> <li> &middot; </li>
 <li> <A HREF="../mailinglists.html">Mailing Lists</A> </li> <li> &middot; </li>
 <li> <A HREF="../developer.html">Developer</A> </li> <li> &middot; </li>
 <li> <A HREF="../search.html">Search</A> </li> <li> &middot; </li>
diff --git a/news/news2005.html b/news/news2005.html
index 9f310a2..a0f14a0 100644
--- a/news/news2005.html
+++ b/news/news2005.html
@@ -24,7 +24,7 @@
 <li> <A HREF="../license.html">License</A> </li> <li> &middot; </li>
 <li> <A HREF="../download.html">Download</A> </li> 
 <br>
-<li> <A HREF="http://geda-project.org/wiki">Documentation</A> </li> <li> &middot; </li>
+<li> <A HREF="http://wiki.geda-project.org">Documentation</A> </li> <li> &middot; </li>
 <li> <A HREF="../mailinglists.html">Mailing Lists</A> </li> <li> &middot; </li>
 <li> <A HREF="../developer.html">Developer</A> </li> <li> &middot; </li>
 <li> <A HREF="../search.html">Search</A> </li> <li> &middot; </li>
diff --git a/news/news2006.html b/news/news2006.html
index d137742..61075ca 100644
--- a/news/news2006.html
+++ b/news/news2006.html
@@ -24,7 +24,7 @@
 <li> <A HREF="../license.html">License</A> </li> <li> &middot; </li>
 <li> <A HREF="../download.html">Download</A> </li> 
 <br>
-<li> <A HREF="http://geda-project.org/wiki">Documentation</A> </li> <li> &middot; </li>
+<li> <A HREF="http://wiki.geda-project.org">Documentation</A> </li> <li> &middot; </li>
 <li> <A HREF="../mailinglists.html">Mailing Lists</A> </li> <li> &middot; </li>
 <li> <A HREF="../developer.html">Developer</A> </li> <li> &middot; </li>
 <li> <A HREF="../search.html">Search</A> </li> <li> &middot; </li>
diff --git a/news/news2007.html b/news/news2007.html
index b3ef689..a6b5807 100644
--- a/news/news2007.html
+++ b/news/news2007.html
@@ -24,7 +24,7 @@
 <li> <A HREF="../license.html">License</A> </li> <li> &middot; </li>
 <li> <A HREF="../download.html">Download</A> </li> 
 <br>
-<li> <A HREF="http://geda-project.org/wiki">Documentation</A> </li> <li> &middot; </li>
+<li> <A HREF="http://wiki.geda-project.org">Documentation</A> </li> <li> &middot; </li>
 <li> <A HREF="../mailinglists.html">Mailing Lists</A> </li> <li> &middot; </li>
 <li> <A HREF="../developer.html">Developer</A> </li> <li> &middot; </li>
 <li> <A HREF="../search.html">Search</A> </li> <li> &middot; </li>
diff --git a/news/news2008.html b/news/news2008.html
index 8c65af4..643a5f9 100644
--- a/news/news2008.html
+++ b/news/news2008.html
@@ -24,7 +24,7 @@
 <li> <A HREF="../license.html">License</A> </li> <li> &middot; </li>
 <li> <A HREF="../download.html">Download</A> </li> 
 <br>
-<li> <A HREF="http://geda-project.org/wiki">Documentation</A> </li> <li> &middot; </li>
+<li> <A HREF="http://wiki.geda-project.org">Documentation</A> </li> <li> &middot; </li>
 <li> <A HREF="../mailinglists.html">Mailing Lists</A> </li> <li> &middot; </li>
 <li> <A HREF="../developer.html">Developer</A> </li> <li> &middot; </li>
 <li> <A HREF="../search.html">Search</A> </li> <li> &middot; </li>
@@ -220,9 +220,9 @@ Summer of Code program (second year)!  We are now looking for students
 to work on all the exciting projects.  Check out the project ideas and
 please contact us if you are interested in participating as a student.
 <br>
-<A HREF="http://geda-project.org/wiki/gsoc2008">
+<A HREF="http://wiki.geda-project.org/gsoc2008">
 Main GSoc page</A> |
-<A HREF="http://geda-project.org/wiki/gsoc2008_projects">
+<A HREF="http://wiki.geda-project.org/gsoc2008_projects">
 GSoC 2008 Project ideas</A>
 <p>
 
diff --git a/news/news2009.html b/news/news2009.html
index 2daf1ea..31c8d5a 100644
--- a/news/news2009.html
+++ b/news/news2009.html
@@ -24,7 +24,7 @@
 <li> <A HREF="../license.html">License</A> </li> <li> &middot; </li>
 <li> <A HREF="../download.html">Download</A> </li> 
 <br>
-<li> <A HREF="http://geda-project.org/wiki">Documentation</A> </li> <li> &middot; </li>
+<li> <A HREF="http://wiki.geda-project.org">Documentation</A> </li> <li> &middot; </li>
 <li> <A HREF="../mailinglists.html">Mailing Lists</A> </li> <li> &middot; </li>
 <li> <A HREF="../developer.html">Developer</A> </li> <li> &middot; </li>
 <li> <A HREF="../search.html">Search</A> </li> <li> &middot; </li>
diff --git a/people.html b/people.html
index 6c96d6d..39e2af9 100644
--- a/people.html
+++ b/people.html
@@ -18,11 +18,11 @@
 
 <UL>
 <br>
-<A HREF="http://geda-project.org/wiki/geda:screenshots"><b>Screenshots</b></A> &middot;
-<A HREF="http://geda-project.org/wiki"><b>Documentation</b></A> &middot;
-<A HREF="http://geda-project.org/wiki/geda:download"><b>Download</b></A> &middot;
+<A HREF="http://wiki.geda-project.org/geda:screenshots"><b>Screenshots</b></A> &middot;
+<A HREF="http://wiki.geda-project.org"><b>Documentation</b></A> &middot;
+<A HREF="http://wiki.geda-project.org/geda:download"><b>Download</b></A> &middot;
 <A HREF="./search.html"><b>Search</b></A> &middot;
-<A HREF="http://geda-project.org/wiki/geda:links"><b>Links</b></A>
+<A HREF="http://wiki.geda-project.org/geda:links"><b>Links</b></A>
 </UL>
 
 <div id="navundertext">
diff --git a/press/LFPressRelease.html b/press/LFPressRelease.html
index 3221770..2b7c88d 100644
--- a/press/LFPressRelease.html
+++ b/press/LFPressRelease.html
@@ -18,11 +18,11 @@
 
 <UL>
 <br>
-<A HREF="http://geda-project.org/wiki/geda:screenshots"><b>Screenshots</b></A> &middot;
-<A HREF="http://geda-project.org/wiki"><b>Documentation</b></A> &middot;
-<A HREF="http://geda-project.org/wiki/geda:download"><b>Download</b></A> &middot;
+<A HREF="http://wiki.geda-project.org/geda:screenshots"><b>Screenshots</b></A> &middot;
+<A HREF="http://wiki.geda-project.org"><b>Documentation</b></A> &middot;
+<A HREF="http://wiki.geda-project.org/geda:download"><b>Download</b></A> &middot;
 <A HREF="../search.html"><b>Search</b></A> &middot;
-<A HREF="http://geda-project.org/wiki/geda:links"><b>Links</b></A>
+<A HREF="http://wiki.geda-project.org/geda:links"><b>Links</b></A>
 </UL>
 
 <div id="navundertext">
diff --git a/search.html b/search.html
index bb7062b..f0ae59e 100644
--- a/search.html
+++ b/search.html
@@ -18,11 +18,11 @@
 
 <UL>
 <br>
-<A HREF="http://geda-project.org/wiki/geda:screenshots"><b>Screenshots</b></A> &middot;
-<A HREF="http://geda-project.org/wiki"><b>Documentation</b></A> &middot;
-<A HREF="http://geda-project.org/wiki/geda:download"><b>Download</b></A> &middot;
+<A HREF="http://wiki.geda-project.org/geda:screenshots"><b>Screenshots</b></A> &middot;
+<A HREF="http://wiki.geda-project.org"><b>Documentation</b></A> &middot;
+<A HREF="http://wiki.geda-project.org/geda:download"><b>Download</b></A> &middot;
 <A HREF="./search.html"><b>Search</b></A> &middot;
-<A HREF="http://geda-project.org/wiki/geda:links"><b>Links</b></A>
+<A HREF="http://wiki.geda-project.org/geda:links"><b>Links</b></A>
 </UL>
 
 <div id="navundertext">
diff --git a/tools/docs/index.html b/tools/docs/index.html
index e0594b5..a9d14aa 100644
--- a/tools/docs/index.html
+++ b/tools/docs/index.html
@@ -24,7 +24,7 @@
 <li> <A HREF="../../license.html">License</A> </li> <li> &middot; </li>
 <li> <A HREF="../../download.html">Download</A> <li> </li> 
 <br>
-<li> <A HREF="http://geda-project.org/wiki">Documentation</A> </li> <li> &middot; </li>
+<li> <A HREF="http://wiki.geda-project.org">Documentation</A> </li> <li> &middot; </li>
 <li> <A HREF="../../mailinglists.html">Mailing Lists</A> </li> <li> &middot;
 <li> <A HREF="../../developer.html">Developer</A> </li> <li> &middot; </li>
 <li> <A HREF="../../search.html">Search</A> </li> <li> &middot; </li>
diff --git a/tools/examples/index.html b/tools/examples/index.html
index 95d5694..bb00341 100644
--- a/tools/examples/index.html
+++ b/tools/examples/index.html
@@ -23,7 +23,7 @@
 <li> <A HREF="../../license.html">License</A> </li> <li> &middot; </li>
 <li> <A HREF="../../download.html">Download</A> <li> </li> 
 <br>
-<li> <A HREF="http://geda-project.org/wiki">Documentation</A> </li> <li> &middot; </li>
+<li> <A HREF="http://wiki.geda-project.org">Documentation</A> </li> <li> &middot; </li>
 <li> <A HREF="../../mailinglists.html">Mailing Lists</A> </li> <li> &middot;
 <li> <A HREF="../../developer.html">Developer</A> </li> <li> &middot; </li>
 <li> <A HREF="../../search.html">Search</A> </li> <li> &middot; </li>
diff --git a/tools/gattrib/index.html b/tools/gattrib/index.html
index 653c514..de5c39f 100644
--- a/tools/gattrib/index.html
+++ b/tools/gattrib/index.html
@@ -23,7 +23,7 @@
 <li> <A HREF="../../license.html">License</A> </li> <li> &middot; </li>
 <li> <A HREF="../../download.html">Download</A> <li> </li> 
 <br>
-<li> <A HREF="http://geda-project.org/wiki">Documentation</A> </li> <li> &middot; </li>
+<li> <A HREF="http://wiki.geda-project.org">Documentation</A> </li> <li> &middot; </li>
 <li> <A HREF="../../mailinglists.html">Mailing Lists</A> </li> <li> &middot;
 <li> <A HREF="../../developer.html">Developer</A> </li> <li> &middot; </li>
 <li> <A HREF="../../search.html">Search</A> </li> <li> &middot; </li>
diff --git a/tools/gerbv/index.html b/tools/gerbv/index.html
index a6eb5a8..eb1364e 100644
--- a/tools/gerbv/index.html
+++ b/tools/gerbv/index.html
@@ -23,7 +23,7 @@
 <li> <A HREF="../../license.html">License</A> </li> <li> &middot; </li>
 <li> <A HREF="../../download.html">Download</A> <li> </li> 
 <br>
-<li> <A HREF="http://geda-project.org/wiki">Documentation</A> </li> <li> &middot; </li>
+<li> <A HREF="http://wiki.geda-project.org">Documentation</A> </li> <li> &middot; </li>
 <li> <A HREF="../../mailinglists.html">Mailing Lists</A> </li> <li> &middot;
 <li> <A HREF="../../developer.html">Developer</A> </li> <li> &middot; </li>
 <li> <A HREF="../../search.html">Search</A> </li> <li> &middot; </li>
diff --git a/tools/gnetlist/index.html b/tools/gnetlist/index.html
index ac10f95..cdcc380 100644
--- a/tools/gnetlist/index.html
+++ b/tools/gnetlist/index.html
@@ -23,7 +23,7 @@
 <li> <A HREF="../../license.html">License</A> </li> <li> &middot; </li>
 <li> <A HREF="../../download.html">Download</A> <li> </li> 
 <br>
-<li> <A HREF="http://geda-project.org/wiki">Documentation</A> </li> <li> &middot; </li>
+<li> <A HREF="http://wiki.geda-project.org">Documentation</A> </li> <li> &middot; </li>
 <li> <A HREF="../../mailinglists.html">Mailing Lists</A> </li> <li> &middot;
 <li> <A HREF="../../developer.html">Developer</A> </li> <li> &middot; </li>
 <li> <A HREF="../../search.html">Search</A> </li> <li> &middot; </li>
diff --git a/tools/gnucap/index.html b/tools/gnucap/index.html
index af375d3..a29a330 100644
--- a/tools/gnucap/index.html
+++ b/tools/gnucap/index.html
@@ -23,7 +23,7 @@
 <li> <A HREF="../../license.html">License</A> </li> <li> &middot; </li>
 <li> <A HREF="../../download.html">Download</A> <li> </li> 
 <br>
-<li> <A HREF="http://geda-project.org/wiki">Documentation</A> </li> <li> &middot; </li>
+<li> <A HREF="http://wiki.geda-project.org">Documentation</A> </li> <li> &middot; </li>
 <li> <A HREF="../../mailinglists.html">Mailing Lists</A> </li> <li> &middot;
 <li> <A HREF="../../developer.html">Developer</A> </li> <li> &middot; </li>
 <li> <A HREF="../../search.html">Search</A> </li> <li> &middot; </li>
diff --git a/tools/gnucapplus/index.html b/tools/gnucapplus/index.html
index 1d65819..6385656 100644
--- a/tools/gnucapplus/index.html
+++ b/tools/gnucapplus/index.html
@@ -23,7 +23,7 @@
 <li> <A HREF="../../license.html">License</A> </li> <li> &middot; </li>
 <li> <A HREF="../../download.html">Download</A> <li> </li> 
 <br>
-<li> <A HREF="http://geda-project.org/wiki">Documentation</A> </li> <li> &middot; </li>
+<li> <A HREF="http://wiki.geda-project.org">Documentation</A> </li> <li> &middot; </li>
 <li> <A HREF="../../mailinglists.html">Mailing Lists</A> </li> <li> &middot;
 <li> <A HREF="../../developer.html">Developer</A> </li> <li> &middot; </li>
 <li> <A HREF="../../search.html">Search</A> </li> <li> &middot; </li>
diff --git a/tools/gschem/index.html b/tools/gschem/index.html
index 772c905..0851be5 100644
--- a/tools/gschem/index.html
+++ b/tools/gschem/index.html
@@ -23,7 +23,7 @@
 <li> <A HREF="../../license.html">License</A> </li> <li> &middot; </li>
 <li> <A HREF="../../download.html">Download</A> <li> </li> 
 <br>
-<li> <A HREF="http://geda-project.org/wiki">Documentation</A> </li> <li> &middot; </li>
+<li> <A HREF="http://wiki.geda-project.org">Documentation</A> </li> <li> &middot; </li>
 <li> <A HREF="../../mailinglists.html">Mailing Lists</A> </li> <li> &middot;
 <li> <A HREF="../../developer.html">Developer</A> </li> <li> &middot; </li>
 <li> <A HREF="../../search.html">Search</A> </li> <li> &middot; </li>
diff --git a/tools/gspiceui/index.html b/tools/gspiceui/index.html
index 1636b09..98af77f 100644
--- a/tools/gspiceui/index.html
+++ b/tools/gspiceui/index.html
@@ -23,7 +23,7 @@
 <li> <A HREF="../../license.html">License</A> </li> <li> &middot; </li>
 <li> <A HREF="../../download.html">Download</A> <li> </li> 
 <br>
-<li> <A HREF="http://geda-project.org/wiki">Documentation</A> </li> <li> &middot; </li>
+<li> <A HREF="http://wiki.geda-project.org">Documentation</A> </li> <li> &middot; </li>
 <li> <A HREF="../../mailinglists.html">Mailing Lists</A> </li> <li> &middot;
 <li> <A HREF="../../developer.html">Developer</A> </li> <li> &middot; </li>
 <li> <A HREF="../../search.html">Search</A> </li> <li> &middot; </li>
diff --git a/tools/gsymcheck/index.html b/tools/gsymcheck/index.html
index 8a0376f..7b6b757 100644
--- a/tools/gsymcheck/index.html
+++ b/tools/gsymcheck/index.html
@@ -23,7 +23,7 @@
 <li> <A HREF="../../license.html">License</A> </li> <li> &middot; </li>
 <li> <A HREF="../../download.html">Download</A> <li> </li> 
 <br>
-<li> <A HREF="http://geda-project.org/wiki">Documentation</A> </li> <li> &middot; </li>
+<li> <A HREF="http://wiki.geda-project.org">Documentation</A> </li> <li> &middot; </li>
 <li> <A HREF="../../mailinglists.html">Mailing Lists</A> </li> <li> &middot;
 <li> <A HREF="../../developer.html">Developer</A> </li> <li> &middot; </li>
 <li> <A HREF="../../search.html">Search</A> </li> <li> &middot; </li>
diff --git a/tools/gtkwave/index.html b/tools/gtkwave/index.html
index b26e80c..69005a2 100644
--- a/tools/gtkwave/index.html
+++ b/tools/gtkwave/index.html
@@ -23,7 +23,7 @@
 <li> <A HREF="../../license.html">License</A> </li> <li> &middot; </li>
 <li> <A HREF="../../download.html">Download</A> <li> </li> 
 <br>
-<li> <A HREF="http://geda-project.org/wiki">Documentation</A> </li> <li> &middot; </li>
+<li> <A HREF="http://wiki.geda-project.org">Documentation</A> </li> <li> &middot; </li>
 <li> <A HREF="../../mailinglists.html">Mailing Lists</A> </li> <li> &middot;
 <li> <A HREF="../../developer.html">Developer</A> </li> <li> &middot; </li>
 <li> <A HREF="../../search.html">Search</A> </li> <li> &middot; </li>
diff --git a/tools/gwave/index.html b/tools/gwave/index.html
index 93f0e1e..d77c988 100644
--- a/tools/gwave/index.html
+++ b/tools/gwave/index.html
@@ -23,7 +23,7 @@
 <li> <A HREF="../../license.html">License</A> </li> <li> &middot; </li>
 <li> <A HREF="../../download.html">Download</A> <li> </li> 
 <br>
-<li> <A HREF="http://geda-project.org/wiki">Documentation</A> </li> <li> &middot; </li>
+<li> <A HREF="http://wiki.geda-project.org">Documentation</A> </li> <li> &middot; </li>
 <li> <A HREF="../../mailinglists.html">Mailing Lists</A> </li> <li> &middot;
 <li> <A HREF="../../developer.html">Developer</A> </li> <li> &middot; </li>
 <li> <A HREF="../../search.html">Search</A> </li> <li> &middot; </li>
diff --git a/tools/icarus/index.html b/tools/icarus/index.html
index 3a5844b..54e92ae 100644
--- a/tools/icarus/index.html
+++ b/tools/icarus/index.html
@@ -23,7 +23,7 @@
 <li> <A HREF="../../license.html">License</A> </li> <li> &middot; </li>
 <li> <A HREF="../../download.html">Download</A> <li> </li> 
 <br>
-<li> <A HREF="http://geda-project.org/wiki">Documentation</A> </li> <li> &middot; </li>
+<li> <A HREF="http://wiki.geda-project.org">Documentation</A> </li> <li> &middot; </li>
 <li> <A HREF="../../mailinglists.html">Mailing Lists</A> </li> <li> &middot;
 <li> <A HREF="../../developer.html">Developer</A> </li> <li> &middot; </li>
 <li> <A HREF="../../search.html">Search</A> </li> <li> &middot; </li>
diff --git a/tools/index.html b/tools/index.html
index f0506e3..5319edc 100644
--- a/tools/index.html
+++ b/tools/index.html
@@ -24,7 +24,7 @@
 <li> <A HREF="../license.html">License</A> </li> <li> &middot; </li>
 <li> <A HREF="../download.html">Download</A> </li> 
 <br>
-<li> <A HREF="http://geda-project.org/wiki">Documentation</A> </li> <li> &middot; </li>
+<li> <A HREF="http://wiki.geda-project.org">Documentation</A> </li> <li> &middot; </li>
 <li> <A HREF="../mailinglists.html">Mailing Lists</A> </li> <li> &middot; </li>
 <li> <A HREF="../developer.html">Developer</A> </li> <li> &middot; </li>
 <li> <A HREF="../search.html">Search</A> </li> <li> &middot; </li>
diff --git a/tools/ngspice/index.html b/tools/ngspice/index.html
index 591a49d..5d3c553 100644
--- a/tools/ngspice/index.html
+++ b/tools/ngspice/index.html
@@ -23,7 +23,7 @@
 <li> <A HREF="../../license.html">License</A> </li> <li> &middot; </li>
 <li> <A HREF="../../download.html">Download</A> <li> </li> 
 <br>
-<li> <A HREF="http://geda-project.org/wiki">Documentation</A> </li> <li> &middot; </li>
+<li> <A HREF="http://wiki.geda-project.org">Documentation</A> </li> <li> &middot; </li>
 <li> <A HREF="../../mailinglists.html">Mailing Lists</A> </li> <li> &middot;
 <li> <A HREF="../../developer.html">Developer</A> </li> <li> &middot; </li>
 <li> <A HREF="../../search.html">Search</A> </li> <li> &middot; </li>
diff --git a/tools/old/geda/index.html b/tools/old/geda/index.html
index 5f5b3d4..edf4d3c 100644
--- a/tools/old/geda/index.html
+++ b/tools/old/geda/index.html
@@ -23,7 +23,7 @@
 <li> <A HREF="../../license.html">License</A> </li> <li> &middot; </li>
 <li> <A HREF="../../download.html">Download</A> <li> </li> 
 <br>
-<li> <A HREF="http://geda-project.org/wiki">Documentation</A> </li> <li> &middot; </li>
+<li> <A HREF="http://wiki.geda-project.org">Documentation</A> </li> <li> &middot; </li>
 <li> <A HREF="../../mailinglists.html">Mailing Lists</A> </li> <li> &middot;
 <li> <A HREF="../../developer.html">Developer</A> </li> <li> &middot; </li>
 <li> <A HREF="../../search.html">Search</A> </li> <li> &middot; </li>
diff --git a/tools/old/setup/index.html b/tools/old/setup/index.html
index c42b74a..6b635e9 100644
--- a/tools/old/setup/index.html
+++ b/tools/old/setup/index.html
@@ -23,7 +23,7 @@
 <li> <A HREF="../../license.html">License</A> </li> &middot;
 <li> <A HREF="../../download.html">Download</A> </li> 
 <br>
-<li> <A HREF="http://geda-project.org/wiki">Documentation</A> </li> &middot;
+<li> <A HREF="http://wiki.geda-project.org">Documentation</A> </li> &middot;
 <li> <A HREF="../../mailinglist/index.html">Mailing Lists</A> </li> &middot;
 <li> <A HREF="../../developer.html">Developer</A> </li> &middot;
 <li> <A HREF="../../search.html">Search</A> </li> &middot;
diff --git a/tools/old/tclspice/index.html b/tools/old/tclspice/index.html
index 40f61e3..c7fecea 100644
--- a/tools/old/tclspice/index.html
+++ b/tools/old/tclspice/index.html
@@ -23,7 +23,7 @@
 <li> <A HREF="../../license.html">License</A> </li> &middot;
 <li> <A HREF="../../download.html">Download</A> </li> 
 <br>
-<li> <A HREF="http://geda-project.org/wiki">Documentation</A> </li> &middot;
+<li> <A HREF="http://wiki.geda-project.org">Documentation</A> </li> &middot;
 <li> <A HREF="../../mailinglist/index.html">Mailing Lists</A> </li> &middot;
 <li> <A HREF="../../developer.html">Developer</A> </li> &middot;
 <li> <A HREF="../../search.html">Search</A> </li> &middot;
diff --git a/tools/old/vbs/index.html b/tools/old/vbs/index.html
index 0fbfdc9..73445b8 100644
--- a/tools/old/vbs/index.html
+++ b/tools/old/vbs/index.html
@@ -23,7 +23,7 @@
 <li> <A HREF="../../license.html">License</A> </li> &middot;
 <li> <A HREF="../../download.html">Download</A> </li> 
 <br>
-<li> <A HREF="http://geda-project.org/wiki">Documentation</A> </li> &middot;
+<li> <A HREF="http://wiki.geda-project.org">Documentation</A> </li> &middot;
 <li> <A HREF="../../mailinglist/index.html">Mailing Lists</A> </li> &middot;
 <li> <A HREF="../../developer.html">Developer</A> </li> &middot;
 <li> <A HREF="../../search.html">Search</A> </li> &middot;
diff --git a/tools/pcb/index.html b/tools/pcb/index.html
index 90a8558..e6feb21 100644
--- a/tools/pcb/index.html
+++ b/tools/pcb/index.html
@@ -23,7 +23,7 @@
 <li> <A HREF="../../license.html">License</A> </li> <li> &middot; </li>
 <li> <A HREF="../../download.html">Download</A> <li> </li> 
 <br>
-<li> <A HREF="http://geda-project.org/wiki">Documentation</A> </li> <li> &middot; </li>
+<li> <A HREF="http://wiki.geda-project.org">Documentation</A> </li> <li> &middot; </li>
 <li> <A HREF="../../mailinglists.html">Mailing Lists</A> </li> <li> &middot;
 <li> <A HREF="../../developer.html">Developer</A> </li> <li> &middot; </li>
 <li> <A HREF="../../search.html">Search</A> </li> <li> &middot; </li>
diff --git a/tools/symbols/index.html b/tools/symbols/index.html
index 95a1fb2..5683dcd 100644
--- a/tools/symbols/index.html
+++ b/tools/symbols/index.html
@@ -23,7 +23,7 @@
 <li> <A HREF="../../license.html">License</A> </li> <li> &middot; </li>
 <li> <A HREF="../../download.html">Download</A> <li> </li> 
 <br>
-<li> <A HREF="http://geda-project.org/wiki">Documentation</A> </li> <li> &middot; </li>
+<li> <A HREF="http://wiki.geda-project.org">Documentation</A> </li> <li> &middot; </li>
 <li> <A HREF="../../mailinglists.html">Mailing Lists</A> </li> <li> &middot;
 <li> <A HREF="../../developer.html">Developer</A> </li> <li> &middot; </li>
 <li> <A HREF="../../search.html">Search</A> </li> <li> &middot; </li>
@@ -100,11 +100,11 @@ have to create symbols for the devices that you want to use in your
 circuit designs.  There are three ways of creating schematic symbols:<p>
 
 <UL>
-<LI> Use gschem to draw the symbols.  This is the most common and popular way.  Please be sure to read the <A HREF="http://geda-project.org/wiki/geda:scg">Symbol Creation Document</A> on guidelines and tips for designing and drawing symbols.</LI>
+<LI> Use gschem to draw the symbols.  This is the most common and popular way.  Please be sure to read the <A HREF="http://wiki.geda-project.org/geda:scg">Symbol Creation Document</A> on guidelines and tips for designing and drawing symbols.</LI>
 <p>
 <LI> Use one of the symbol creation programs.  There are several programs out there which take as input a text file describing the symbol and as output generate schematic symbols.  Two popular symbol generators are: gmk_sym and tragesym.  Both of these symbol generators are part of gEDA/gaf's <A HREF="../utils/index.html">Utilities</A>.</LI>
 <p>
-<LI> The final option is to create symbols with a text editor.  The file format of the symbols (and schematics) can be found in the <A HREF="http://geda-project.org/wiki/geda:file_format_spec">File Format Document</A>.   Also be sure to checkout the <A HREF="http://geda-project.org/wiki/geda:master_attributes_list">Master Attribute List</A> document.
+<LI> The final option is to create symbols with a text editor.  The file format of the symbols (and schematics) can be found in the <A HREF="http://wiki.geda-project.org/geda:file_format_spec">File Format Document</A>.   Also be sure to checkout the <A HREF="http://wiki.geda-project.org/geda:master_attributes_list">Master Attribute List</A> document.
 </UL>
 <p>
 
diff --git a/tools/utils/index.html b/tools/utils/index.html
index c5bed67..4133513 100644
--- a/tools/utils/index.html
+++ b/tools/utils/index.html
@@ -23,7 +23,7 @@
 <li> <A HREF="../../license.html">License</A> </li> <li> &middot; </li>
 <li> <A HREF="../../download.html">Download</A> <li> </li> 
 <br>
-<li> <A HREF="http://geda-project.org/wiki">Documentation</A> </li> <li> &middot; </li>
+<li> <A HREF="http://wiki.geda-project.org">Documentation</A> </li> <li> &middot; </li>
 <li> <A HREF="../../mailinglists.html">Mailing Lists</A> </li> <li> &middot;
 <li> <A HREF="../../developer.html">Developer</A> </li> <li> &middot; </li>
 <li> <A HREF="../../search.html">Search</A> </li> <li> &middot; </li>
diff --git a/tools/vhd2vl/index.html b/tools/vhd2vl/index.html
index a75ac5e..e1e4116 100644
--- a/tools/vhd2vl/index.html
+++ b/tools/vhd2vl/index.html
@@ -23,7 +23,7 @@
 <li> <A HREF="../../license.html">License</A> </li> <li> &middot; </li>
 <li> <A HREF="../../download.html">Download</A> <li> </li> 
 <br>
-<li> <A HREF="http://geda-project.org/wiki">Documentation</A> </li> <li> &middot; </li>
+<li> <A HREF="http://wiki.geda-project.org">Documentation</A> </li> <li> &middot; </li>
 <li> <A HREF="../../mailinglists.html">Mailing Lists</A> </li> <li> &middot;
 <li> <A HREF="../../developer.html">Developer</A> </li> <li> &middot; </li>
 <li> <A HREF="../../search.html">Search</A> </li> <li> &middot; </li>
diff --git a/tools/wcalc/index.html b/tools/wcalc/index.html
index 929db58..afb3c9a 100644
--- a/tools/wcalc/index.html
+++ b/tools/wcalc/index.html
@@ -23,7 +23,7 @@
 <li> <A HREF="../../license.html">License</A> </li> <li> &middot; </li>
 <li> <A HREF="../../download.html">Download</A> <li> </li> 
 <br>
-<li> <A HREF="http://geda-project.org/wiki">Documentation</A> </li> <li> &middot; </li>
+<li> <A HREF="http://wiki.geda-project.org">Documentation</A> </li> <li> &middot; </li>
 <li> <A HREF="../../mailinglists.html">Mailing Lists</A> </li> <li> &middot;
 <li> <A HREF="../../developer.html">Developer</A> </li> <li> &middot; </li>
 <li> <A HREF="../../search.html">Search</A> </li> <li> &middot; </li>
diff --git a/tools/xgsch2pcb/index.html b/tools/xgsch2pcb/index.html
index 703a565..00c6537 100644
--- a/tools/xgsch2pcb/index.html
+++ b/tools/xgsch2pcb/index.html
@@ -18,7 +18,7 @@
 <li> <A HREF="../../license.html">License</A> </li> <li> &middot; </li>
 <li> <A HREF="../../download.html">Download</A> <li> </li> 
 <br>
-<li> <A HREF="http://geda-project.org/wiki">Documentation</A> </li> <li> &middot; </li>
+<li> <A HREF="http://wiki.geda-project.org">Documentation</A> </li> <li> &middot; </li>
 <li> <A HREF="../../mailinglists.html">Mailing Lists</A> </li> <li> &middot;
 <li> <A HREF="../../developer.html">Developer</A> </li> <li> &middot; </li>
 <li> <A HREF="../../search.html">Search</A> </li> <li> &middot; </li>