diff --git a/core/web/html/contact.html b/core/web/html/contact.html
index a878d4bf2..761345e59 100644
--- a/core/web/html/contact.html
+++ b/core/web/html/contact.html
@@ -25,7 +25,7 @@
         <li><a href="features.html">Features and screenshots</a></li>
         <li><a href="download.html">Download</a></li>
         <li><a href="documentation.html">Documentation</a></li>
-        <li><a href="http://sourceforge.net/apps/mediawiki/openrocket/">Wiki pages</a></li>
+        <li><a href="http://wiki.openrocket.info/">Wiki pages</a></li>
         <li><a href="http://openrocket.trans.free.fr/">Translations</a></li>
         <li><a href="getinvolved.html">Get involved!</a></li>
         <li><a href="contact.html">
diff --git a/core/web/html/documentation.html b/core/web/html/documentation.html
index 9a3542c01..4d2d29f90 100644
--- a/core/web/html/documentation.html
+++ b/core/web/html/documentation.html
@@ -25,7 +25,7 @@
         <li><a href="features.html">Features and screenshots</a></li>
         <li><a href="download.html">Download</a></li>
         <li><a href="documentation.html">Documentation</a></li>
-        <li><a href="http://sourceforge.net/apps/mediawiki/openrocket/">Wiki pages</a></li>
+        <li><a href="http://wiki.openrocket.info/">Wiki pages</a></li>
         <li><a href="http://openrocket.trans.free.fr/">Translations</a></li>
         <li><a href="getinvolved.html">Get involved!</a></li>
         <li><a href="contact.html">
@@ -49,11 +49,11 @@
     <h2>User documentation</h2>
     <p>Unfortunately no user's guide currently exists for OpenRocket.
       Some documentation is available in the
-      <a href="http://apps.sourceforge.net/mediawiki/openrocket/">OpenRocket
+      <a href="http://wiki.openrocket.info/">OpenRocket
       wiki pages</a>, including a stub
-      <a href="https://sourceforge.net/apps/mediawiki/openrocket/index.php?title=User%27s_Guide">User's
+      <a href="http://wiki.openrocket.info/User%27s_Guide">User's
       guide</a> and a section of
-      <a href="https://sourceforge.net/apps/mediawiki/openrocket/index.php?title=FAQ">frequently
+      <a href="http://wiki.openrocket.info/FAQ">frequently
       asked questions</a>.</p>
     <p>If you would like to help, please extend the documentation!</p>
     <h2>Technical documentation</h2>
@@ -97,7 +97,7 @@
     </ol>
     <h2>Resources</h2>
     <p>A list of useful technical rocketry resources is available in
-      the <a href="https://sourceforge.net/apps/mediawiki/openrocket/index.php?title=Resources">"Resources"
+      the <a href="http://wiki.openrocket.info/Resources">"Resources"
       wiki page</a>, including links to Barrowman's original report and
       thesis, extensions for the Barrowman method, experimental rocket
       data etc.</p>
diff --git a/core/web/html/download.html b/core/web/html/download.html
index a980f92b0..0df03c0da 100644
--- a/core/web/html/download.html
+++ b/core/web/html/download.html
@@ -25,7 +25,7 @@
         <li><a href="features.html">Features and screenshots</a></li>
         <li><a href="download.html">Download</a></li>
         <li><a href="documentation.html">Documentation</a></li>
-        <li><a href="http://sourceforge.net/apps/mediawiki/openrocket/">Wiki pages</a></li>
+        <li><a href="http://wiki.openrocket.info/">Wiki pages</a></li>
         <li><a href="http://openrocket.trans.free.fr/">Translations</a></li>
         <li><a href="getinvolved.html">Get involved!</a></li>
         <li><a href="contact.html">
diff --git a/core/web/html/features.html b/core/web/html/features.html
index f774c0635..6ca2d518a 100644
--- a/core/web/html/features.html
+++ b/core/web/html/features.html
@@ -25,7 +25,7 @@
         <li><a href="features.html">Features and screenshots</a></li>
         <li><a href="download.html">Download</a></li>
         <li><a href="documentation.html">Documentation</a></li>
-        <li><a href="http://sourceforge.net/apps/mediawiki/openrocket/">Wiki pages</a></li>
+        <li><a href="http://wiki.openrocket.info/">Wiki pages</a></li>
         <li><a href="http://openrocket.trans.free.fr/">Translations</a></li>
         <li><a href="getinvolved.html">Get involved!</a></li>
         <li><a href="contact.html">
diff --git a/core/web/html/getinvolved.html b/core/web/html/getinvolved.html
index 91023aed8..5cf4ecd51 100644
--- a/core/web/html/getinvolved.html
+++ b/core/web/html/getinvolved.html
@@ -25,7 +25,7 @@
         <li><a href="features.html">Features and screenshots</a></li>
         <li><a href="download.html">Download</a></li>
         <li><a href="documentation.html">Documentation</a></li>
-        <li><a href="http://sourceforge.net/apps/mediawiki/openrocket/">Wiki pages</a></li>
+        <li><a href="http://wiki.openrocket.info/">Wiki pages</a></li>
         <li><a href="http://openrocket.trans.free.fr/">Translations</a></li>
         <li><a href="getinvolved.html">Get involved!</a></li>
         <li><a href="contact.html">
@@ -91,13 +91,9 @@
     </ul>
     <h3 id="documentation">Documentation tasks</h3>
     <p>Contributions to the
-      <a href="https://sourceforge.net/apps/mediawiki/openrocket/index.php?title=User%27s_Guide">OpenRocket
+      <a href="http://wiki.openrocket.info/User%27s_Guide">OpenRocket
       User's guide</a> are dearly needed.  Below are examples of
       topics.</p>
-    <p class="note">(Unfortunately the SourceForge wiki currently does
-      not support public write access to the wiki.  If you'd like to
-      contribute, please <a href="contact.html">contact me</a> and I
-      will provide you write access.)</p>
     <ul>
       <li>Getting started guide</li>
       <li>How to make staged and clustered designs</li>
diff --git a/core/web/html/index.html b/core/web/html/index.html
index 66b4cdf12..01fdbb899 100644
--- a/core/web/html/index.html
+++ b/core/web/html/index.html
@@ -25,7 +25,7 @@
         <li><a href="features.html">Features and screenshots</a></li>
         <li><a href="download.html">Download</a></li>
         <li><a href="documentation.html">Documentation</a></li>
-        <li><a href="http://sourceforge.net/apps/mediawiki/openrocket/">Wiki pages</a></li>
+        <li><a href="http://wiki.openrocket.info/">Wiki pages</a></li>
         <li><a href="http://openrocket.trans.free.fr/">Translations</a></li>
         <li><a href="getinvolved.html">Get involved!</a></li>
         <li><a href="contact.html">
diff --git a/core/web/html/license.html b/core/web/html/license.html
index 3bb00857d..0be7d7bf7 100644
--- a/core/web/html/license.html
+++ b/core/web/html/license.html
@@ -25,7 +25,7 @@
         <li><a href="features.html">Features and screenshots</a></li>
         <li><a href="download.html">Download</a></li>
         <li><a href="documentation.html">Documentation</a></li>
-        <li><a href="http://sourceforge.net/apps/mediawiki/openrocket/">Wiki pages</a></li>
+        <li><a href="http://wiki.openrocket.info/">Wiki pages</a></li>
         <li><a href="http://openrocket.trans.free.fr/">Translations</a></li>
         <li><a href="getinvolved.html">Get involved!</a></li>
         <li><a href="contact.html">
diff --git a/core/web/htp/body.htt b/core/web/htp/body.htt
index 00649d575..4f8b2afd4 100644
--- a/core/web/htp/body.htt
+++ b/core/web/htp/body.htt
@@ -26,7 +26,7 @@
         <li><a href="features.html">Features and screenshots</a></li>
         <li><a href="download.html">Download</a></li>
         <li><a href="documentation.html">Documentation</a></li>
-        <li><a href="http://sourceforge.net/apps/mediawiki/openrocket/">Wiki pages</a></li>
+        <li><a href="http://wiki.openrocket.info/">Wiki pages</a></li>
         <li><a href="http://openrocket.trans.free.fr/">Translations</a></li>
         <li><a href="getinvolved.html">Get involved!</a></li>
         <li><a href="contact.html">
diff --git a/core/web/htp/documentation.htp b/core/web/htp/documentation.htp
index b3b42e2ed..46e36cd7e 100644
--- a/core/web/htp/documentation.htp
+++ b/core/web/htp/documentation.htp
@@ -11,11 +11,11 @@
 
     <p>Unfortunately no user's guide currently exists for OpenRocket.
       Some documentation is available in the 
-      <a href="http://apps.sourceforge.net/mediawiki/openrocket/">OpenRocket
+      <a href="http://wiki.openrocket.info/">OpenRocket
       wiki pages</a>, including a stub
-      <a href="https://sourceforge.net/apps/mediawiki/openrocket/index.php?title=User%27s_Guide">User's
+      <a href="http://wiki.openrocket.info/User%27s_Guide">User's
       guide</a> and a section of
-      <a href="https://sourceforge.net/apps/mediawiki/openrocket/index.php?title=FAQ">frequently
+      <a href="http://wiki.openrocket.info/FAQ">frequently
       asked questions</a>.</p>
 
     <p>If you would like to help, please extend the documentation!</p>
@@ -72,7 +72,7 @@
     <h2>Resources</h2>
 
     <p>A list of useful technical rocketry resources is available in
-      the <a href="https://sourceforge.net/apps/mediawiki/openrocket/index.php?title=Resources">"Resources"
+      the <a href="http://wiki.openrocket.info/Resources">"Resources"
       wiki page</a>, including links to Barrowman's original report and
       thesis, extensions for the Barrowman method, experimental rocket
       data etc.</p>
diff --git a/core/web/htp/getinvolved.htp b/core/web/htp/getinvolved.htp
index 8654be888..1d96bb780 100644
--- a/core/web/htp/getinvolved.htp
+++ b/core/web/htp/getinvolved.htp
@@ -64,16 +64,10 @@
     <h3 id="documentation">Documentation tasks</h3>
 
     <p>Contributions to the
-      <a href="https://sourceforge.net/apps/mediawiki/openrocket/index.php?title=User%27s_Guide">OpenRocket
+      <a href="http://wiki.openrocket.info/User%27s_Guide">OpenRocket
       User's guide</a> are dearly needed.  Below are examples of
       topics.</p>
 
-    <p class="note">(Unfortunately the SourceForge wiki currently does
-      not support public write access to the wiki.  If you'd like to
-      contribute, please <a href="contact.html">contact me</a> and I
-      will provide you write access.)</p>
-
-
     <ul>
       <li>Getting started guide</li>
       <li>How to make staged and clustered designs</li>