diff --git a/ANNOUNCE b/ANNOUNCE
index daf0f3ae7d2..193b555883c 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -35,7 +35,7 @@ formats: wine-doc-html.tar.gz, wine-doc-txt.tar.gz, wine-doc.pdf.gz
 and wine-doc.ps.gz.
 
 You can also get the current source directly from the CVS tree. Check
-http://www.winehq.com/dev.shtml for details.
+http://www.winehq.com/development/ for details.
 
 If you submitted a patch, please check to make sure it has been
 included in the new release.
diff --git a/README b/README
index 623dc80f36c..7ce9cc5a7ce 100644
--- a/README
+++ b/README
@@ -141,7 +141,7 @@ which has to be adapted and copied to the location mentioned above.
 Don't forget to add vital registry entries by applying winedefault.reg
 with programs/regapi/. See documentation/ directory for details.
 
-See http://www.winehq.com/support.shtml for further configuration hints.
+See http://www.winehq.com/support/ for further configuration hints.
 
 In case of library loading errors
 (e.g. "Error while loading shared libraries: libntdll.so"), make sure
@@ -223,11 +223,11 @@ HOWTO:	The Wine HOWTO (outdated !) is available at
 IRC:	Online help is available at channel #WineHQ on irc.openprojects.net.
 
 CVS:	The current Wine development tree is available through CVS.
-	Go to http://www.winehq.com/dev.shtml for more information.
+	Go to http://www.winehq.com/development/ for more information.
 
 Mailing lists:
 	There are several mailing lists for Wine developers; see 
-	http://www.winehq.com/dev.shtml#ml for more information.
+	http://www.winehq.com/development/#ml for more information.
 
 If you add something, or fix a bug, please send a patch (in 'diff -u'
 format) to wine-patches@winehq.com list for inclusion in the next
diff --git a/documentation/fonts.sgml b/documentation/fonts.sgml
index b67cff19113..0cd6cf966ea 100644
--- a/documentation/fonts.sgml
+++ b/documentation/fonts.sgml
@@ -18,7 +18,7 @@
             Wine. It can be found in the <filename>tools</filename>
             directory. Links to the other tools mentioned in this
             document can be found on wine headquarters:
-            <ulink url="http://www.winehq.com/tools.html">http://www.winehq.com/tools.html</ulink>
+            <ulink url="http://www.winehq.com/development/">http://www.winehq.com/development/</ulink>
           </para>
         </note>
       </para>
diff --git a/documentation/getting.sgml b/documentation/getting.sgml
index 25d82c10c6b..cb639e2be05 100644
--- a/documentation/getting.sgml
+++ b/documentation/getting.sgml
@@ -131,7 +131,7 @@ $ su -
       <para>
         The first place you should look if your system isn't Debian or
         Redhat is the <ulink
-        url="http://www.winehq.com/download.html">WineHQ Download
+        url="http://www.winehq.com/download/">WineHQ Download
         Page</ulink>.  This page lists many assorted archives of
         binary (precompiled) Wine files.
       </para>
@@ -212,8 +212,8 @@ $ su -
 
       <para>
         The official web page for Wine CVS is
-        <ulink url="http://www.winehq.com/dev.html">
-          http://www.winehq.com/dev.html</ulink>.
+        <ulink url="http://www.winehq.com/development/">
+          http://www.winehq.com/development/</ulink>.
       </para>
       <para>
         First, you need to get a copy of the latest Wine sources
diff --git a/documentation/installation-und-konfiguration.german b/documentation/installation-und-konfiguration.german
index 90efec9cc38..046ec8b5d46 100644
--- a/documentation/installation-und-konfiguration.german
+++ b/documentation/installation-und-konfiguration.german
@@ -284,7 +284,7 @@ die folgenden Programme und Dateien installiert sein:
    u.a. in der Manualseite zu cvs(1) sowie auf der CVS-Homepage, die
    unter http://www.sourcegear.com/CVS zu erreichen ist. Weitere wichtige
    Hinweise im Hinblick auf CVS und WINE sind unter der Adresse
-   http://www.winehq.com/dev.shtml verfügbar.
+   http://www.winehq.com/development/ verfügbar.
    
 6.0 Konfiguration und Übersetzung des Quellcodes
 
diff --git a/documentation/wine.man.in b/documentation/wine.man.in
index ab1bde7fc7a..1d1b2278d5c 100644
--- a/documentation/wine.man.in
+++ b/documentation/wine.man.in
@@ -333,7 +333,7 @@ pre-built contents of the documentation in various formats
 The latest snapshot of the code may be obtained via CVS.  For information
 on how to do this, please see
 .I
-http://www.winehq.com/dev.html
+http://www.winehq.com/development/
 .PP
 WineHQ, the
 .B wine