Make the winehq.org domain the official one.

diff --git a/ANNOUNCE b/ANNOUNCE
index 8efd85e1..a6b9fa2 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -25,19 +25,19 @@
 wine-doc-pdf.tar.gz and wine-doc-ps.tar.gz.
 
 You can also get the current source directly from the CVS tree. Check
-http://www.winehq.com/cvs for details.
+http://www.winehq.org/cvs for details.
 
-Patches should be submitted to "wine-patches@winehq.com".  Please
+Patches should be submitted to "wine-patches@winehq.org".  Please
 don't forget to include a ChangeLog entry. If you submitted a patch,
 please check to make sure it has been included in the new release.
 
 If you want to receive by mail a patch against the previous release
 when a new one is released, you can subscribe to the mailing list at
-http://www.winehq.com/mailman/listinfo/wine-releases .
+http://www.winehq.org/mailman/listinfo/wine-releases .
 
 Wine is available thanks to the work of many people. See the file
 AUTHORS in the distribution for the complete list.
 
 --
 Alexandre Julliard
-julliard@winehq.com
+julliard@winehq.org
diff --git a/BUGS b/BUGS
index 163840f..b9a96b6 100644
--- a/BUGS
+++ b/BUGS
@@ -8,7 +8,7 @@
 
 If you want to help the Wine project you can:
 
- * visit Bugzilla (http://bugs.winehq.com/) for 
+ * visit Bugzilla (http://bugs.winehq.org/) for 
    a list of existing bugs. You are also welcome to 
    help with Bugzilla - add new bugs, confirm,
    remove duplicates, test fixes, etc.
diff --git a/README b/README
index 510934e..7bece10 100644
--- a/README
+++ b/README
@@ -22,7 +22,7 @@
 problem resolution, read the rest of this file, the Wine man page,
 the files in the documentation directory of the Wine source
 (see "DOCUMENTATION"), and especially the wealth of information
-found at http://www.winehq.com.
+found at http://www.winehq.org.
 
 3. REQUIREMENTS
 
@@ -143,7 +143,7 @@
 Don't forget to add vital registry entries by applying winedefault.reg
 with programs/regedit/. See documentation/ directory for details.
 
-See the Support area at http://www.winehq.com/ for further
+See the Support area at http://www.winehq.org/ for further
 configuration hints.
 
 In case of library loading errors
@@ -208,15 +208,15 @@
 8. GETTING MORE INFORMATION
 
 WWW:	A great deal of information about Wine is available from WineHQ at
-	http://www.winehq.com/ : various Wine Guides, application database,
+	http://www.winehq.org/ : various Wine Guides, application database,
 	bug tracking. This is probably the best starting point.
 
-FAQ:	The Wine FAQ is located at http://www.winehq.com/FAQ
+FAQ:	The Wine FAQ is located at http://www.winehq.org/FAQ
 
 Usenet:	You can discuss Wine-related issues and get help
 	on comp.emulators.ms-windows.wine.
 
-Bugs:	Report bugs to Wine Bugzilla at http://bugs.winehq.com
+Bugs:	Report bugs to Wine Bugzilla at http://bugs.winehq.org
 	Please search the bugzilla database to check whether your
 	problem is already found before posting a bug report.  You can
 	also post bug reports to comp.emulators.ms-windows.wine.
@@ -226,16 +226,16 @@
 IRC:	Online help is available at channel #WineHQ on irc.freenode.net.
 
 CVS:	The current Wine development tree is available through CVS.
-	Go to http://www.winehq.com/cvs for more information.
+	Go to http://www.winehq.org/cvs for more information.
 
 Mailing lists:
 	There are several mailing lists for Wine developers; see
-	http://www.winehq.com/forums for more information.
+	http://www.winehq.org/forums 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
+format) to wine-patches@winehq.org list for inclusion in the next
 release.
 
 --
 Alexandre Julliard
-julliard@winehq.com
+julliard@winehq.org
diff --git a/documentation/PACKAGING b/documentation/PACKAGING
index 46b5b06..e1a965b 100644
--- a/documentation/PACKAGING
+++ b/documentation/PACKAGING
@@ -258,7 +258,7 @@
             Wine stores registry entries in a series of files.
 
             For an excellent overview of this issue, read this
-            http://www.winehq.com/News/2000-25.html#FTR
+            http://www.winehq.org/News/2000-25.html#FTR
             Wine Weekly News feature.
 
             The bottom line is that, at Wine server startup,
diff --git a/documentation/README.fr b/documentation/README.fr
index 983f201..8f5c275 100644
--- a/documentation/README.fr
+++ b/documentation/README.fr
@@ -25,7 +25,7 @@
 reste de ce fichier, les pages "man" de Wine, les fichiers dans le
 répertoire de documentation des sources de Wine (voir "DOCUMENTATION"),
 et surtout les nombreuses informations que vous trouverez sur
-http://www.winehq.com.
+http://www.winehq.org.
 
 3. CONFIGURATION NÉCESSAIRE
 
@@ -155,7 +155,7 @@
 winedefault.reg avec programs/regedit/. Voyez le répertoire documentation/ pour
 les détails.
 
-Naviguez dans la section Support à http://www.winehq.com/ pour plus d'astuces
+Naviguez dans la section Support à http://www.winehq.org/ pour plus d'astuces
 de configuration.
 
 En cas d'erreur de chargement de librairie (par exemple
@@ -226,17 +226,17 @@
 8. OPTENIR PLUS D'INFORMATIONS
 
 WWW:	Baucoup d'informations à propos de Wine sont disponibles sur WineHQ à
-	http://www.winehq.com/ : divers Guides Wine, base de donnée
+	http://www.winehq.org/ : divers Guides Wine, base de donnée
 	d'applications, suivit de bogues. C'est probablement le meilleur point
 	de départ.
 
 FAQ:	La Foire Aux Questions de Wine est localisée à :
-	http://www.winehq.com/FAQ
+	http://www.winehq.org/FAQ
 
 Usenet:	Vous pouvez parler des problèmes ou résolutions en relation avec Wine
 	ou optenir de l'aide sur comp.emulators.ms-windows.wine.
 
-Bugs:	Rapportez les bogues à Wine Bugzilla à http://bugs.winehq.com
+Bugs:	Rapportez les bogues à Wine Bugzilla à http://bugs.winehq.org
 	SVP cherchez tout d'abord dans la base de donnée de bugzilla
 	pour contrôler que le problème n'est pas déjà découvert avant
 	de poster un rapport de bogue. Vous pouvez également rapporter
@@ -249,17 +249,17 @@
 
 CVS:	L'arbre de développement actuel de Wine est disponible au travers
 	de CVS.
-	Allez sur http://www.winehq.com/cvs pour plus d'informations
+	Allez sur http://www.winehq.org/cvs pour plus d'informations
 
 Mailing lists:
 	Il existe de multiples mailing lists pour les développeurs de Wine;
-	repportez-vous à http://www.winehq.com/forums pour de plus
+	repportez-vous à http://www.winehq.org/forums pour de plus
 	amples informations.
 
 Si vous ajoutez quelquechose ou fixez un bogue, envoyez un patch (dans le
-format 'diff -u' ) à la liste de diffusion wine-patches@winehq.com  pour son
+format 'diff -u' ) à la liste de diffusion wine-patches@winehq.org  pour son
 inclusion dans la prochaine version.
 
 --
 Alexandre Julliard
-julliard@winehq.com
+julliard@winehq.org
diff --git a/documentation/README.it b/documentation/README.it
index e027120..668ff04 100644
--- a/documentation/README.it
+++ b/documentation/README.it
@@ -21,7 +21,7 @@
 risoluzione di problemi, leggi il resto di questo file, la pagina Wine man, i
 file nella directory documentazione del sorgente Wine (leggi "DOCUMENTATION"),
 ed in modo particolare la notevole quantità di informazioni che puoi trovare a
-http://www.winehq.com.
+http://www.winehq.org.
 
 3. RICHIESTE DI SISTEMA
 
@@ -150,7 +150,7 @@
 Non scordarti di aggiungere chiavi di registro vitali applicando winedefault.reg
 con programs/regedit/. Controlla la directory documentation/ per i dettagli.
 
-Controlla l'area Support a http://www.winehq.com/ per altri suggerimenti sulla
+Controlla l'area Support a http://www.winehq.org/ per altri suggerimenti sulla
 configurazione.
 
 Nel caso di errori di caricamento delle librerie
@@ -220,16 +220,16 @@
 8. PER OTTENERE PIU' INFORMAZIONI
 
 WWW: Un gran quantitativo di informazioni messe a disposizione da WineHQ su Wine
-è disponibile all'indirizzo http://www.winehq.com/: varie guide a Wine,
+è disponibile all'indirizzo http://www.winehq.org/: varie guide a Wine,
 database, identificazione di bug. Questo è probabilmente il miglior punto di
 partenza.
 
-FAQ: Le FAQ di Wine si trovano all'indirizzo http://www.winehq.com/FAQ
+FAQ: Le FAQ di Wine si trovano all'indirizzo http://www.winehq.org/FAQ
 
 Usenet: Puoi discutere di argomenti collegati a Wine ed ottenere aiuto su
 comp.emulators.ms-windows.wine.
 
-Bugs: Riporta i Bug a Wine Bugzilla a http://bugs.winehq.com per favore cerca
+Bugs: Riporta i Bug a Wine Bugzilla a http://bugs.winehq.org per favore cerca
 nel database di bugzilla per verificare che il tuo problema non sia già stato
 trovato prima di postare un rapporto su un bug. Puoi anche postare i rapporti
 sui bug a comp.emulators.ms-windows.wine. Per favore leggi il file
@@ -238,17 +238,17 @@
 IRC: Aiuto online è disponibile nel canale #WineHQ su irc.freenode.net.
 
 CVS: Il tree di sviluppo corrente di wine e' disponibile in CVS. Visita
-http://www.winehq.com/cvs per altre informazioni.
+http://www.winehq.org/cvs per altre informazioni.
 
 Mailing list: Esistono diverse mailing list per gli sviluppatori di Wine; visita
-http://www.winehq.com/forums per ulteriori informazioni.
+http://www.winehq.org/forums per ulteriori informazioni.
 
 Se aggiungi qualcosa, o correggi un bug, per favore manda una patch (nel formato
-'diff -u') a wine-patches@winehq.com per essere incluso nella prossima release.
+'diff -u') a wine-patches@winehq.org per essere incluso nella prossima release.
 
 --
 Alexandre Julliard
-julliard@winehq.com
+julliard@winehq.org
 
 tradotto da:
 Francesco Di Punzio
diff --git a/documentation/README.pt b/documentation/README.pt
index 649489c..5b0f358 100644
--- a/documentation/README.pt
+++ b/documentation/README.pt
@@ -22,7 +22,7 @@
 informações e resoçução de problemas. Lê o resto deste ficheiro, a Wine 
 man page, os ficheiros incluidos na directoria de documentação  do Wine 
 source (ver "DOCUMENTATION"), e especialmente a abundância de informação 
-encontrada em http://www.winehq.com.
+encontrada em http://www.winehq.org.
 
 3.REQUERIMENTOS
 
@@ -150,7 +150,7 @@
 configuraçao o qual tem que ser adaptado e copiado para a localização 
 mencionada em cima.
 
-Ver http://www.winehq.com/support/ para mais informação sobre a 
+Ver http://www.winehq.org/support/ para mais informação sobre a 
 configuraçao.
 
 No caso da livraria carregar erros (e.g. "Error while loading shared 
@@ -218,11 +218,11 @@
 8.ARRANJAR MAIS INFORMAÇÃO
 
 www:	Uma grande quantidade de informação acerca do Wine está disponivel 
-        pelo WineHQ em http://www.winehq.com/ : varios guias Wine, base de  
+        pelo WineHQ em http://www.winehq.org/ : varios guias Wine, base de  
         dados de aplicações, localizaçao de erros. Isto é provavelmente o 
         melhor ponto de começo.
 
-FAQ:	A Wine FAQ está localizada em http://www.winehq.com/FAQ
+FAQ:	A Wine FAQ está localizada em http://www.winehq.org/FAQ
 
 Usenet:	Tu podes discutor tópicos relacionados de Wine e obter ajuda em
 	comp.emulators.ms-windows.wine.
@@ -231,12 +231,12 @@
 
 
 CVS:	O currente desenvolvimento do Wine está disponivel por CVS.
-	Vai a http://www.winehq.com/cvs para mais informação.
+	Vai a http://www.winehq.org/cvs para mais informação.
 
 Mailing Lists:
 	Há algumas mailing list para responsaveis pelo desenvolvimento Wine; ver em
-	http://www.winehq.com/forums para mais informação.
+	http://www.winehq.org/forums para mais informação.
 
 Se tu acrescentaste algo,ou corrigiste um bug, por favor envia um patch 
-(em 'diff -u' format) para wine-patches_at_winehq.com lista para inclusão 
+(em 'diff -u' format) para wine-patches_at_winehq.org lista para inclusão 
 no próximo lançamento.
diff --git a/documentation/README.pt_br b/documentation/README.pt_br
index 243865b..9306948 100644
--- a/documentation/README.pt_br
+++ b/documentation/README.pt_br
@@ -23,7 +23,7 @@
 informações e resolução de problemas, leia o restante deste arquivo, 
 a página "man" do Wine (man wine), os arquivos incluídos no diretório 
 de documentação do fonte do Wine (veja "DOCUMENTATION"), e especialmente 
-a abundância de informação encontrada em http://www.winehq.com.
+a abundância de informação encontrada em http://www.winehq.org.
 
 3.REQUERIMENTOS
 
@@ -147,7 +147,7 @@
 winedefault.reg com programs/regedit/. Veja o diretório documentation/ 
 para detalhes.
 
-Veja a área de suporte em http://www.winehq.com/ para mais sugestões 
+Veja a área de suporte em http://www.winehq.org/ para mais sugestões 
 sobre a configuraçao.
 
 No caso de erros de carga da biblioteca
@@ -215,16 +215,16 @@
 8. OBTENDO MAIS INFORMAÇÃO
 
 WWW:	Uma grande quantidade de informação sobre o Wine está disponivel 
-        pelo WineHQ em http://www.winehq.com/ : vários guias do Wine,
+        pelo WineHQ em http://www.winehq.org/ : vários guias do Wine,
 	base de dados de aplicações, rastreamento de erros. Este é 
 	provavelmente o melhor ponto para começar.
 
-FAQ:	A Wine FAQ está localizada em http://www.winehq.com/FAQ
+FAQ:	A Wine FAQ está localizada em http://www.winehq.org/FAQ
 
 Usenet:	Pode-se discutir tópicos relacionados ao Wine e obter ajuda em
 	comp.emulators.ms-windows.wine.
 
-Bugs:	Relate erros ao Wine Bugzilla em http://bugs.winehq.com
+Bugs:	Relate erros ao Wine Bugzilla em http://bugs.winehq.org
 	Por favor pesquise a base de dados do bugzilla para verificar se 
 	seu problema já tenha sido encontrado, antes de enviar um 
 	relatório do erro. Você pode também afixar relatórios do erro em
@@ -234,19 +234,19 @@
 IRC:	A ajuda online está disponível em #WineHQ em irc.freenode.net.
 
 CVS:	O árvore de desenvolvimento atual do Wine está disponível por CVS.
-	Vá em http://www.winehq.com/cvs para mais informação.
+	Vá em http://www.winehq.org/cvs para mais informação.
 
 Mailing Lists:
 	Há diversas listas de mensagens para colaboradores no desenvolvimento 
-	do Wine; veja http://www.winehq.com/forums para mais informação.
+	do Wine; veja http://www.winehq.org/forums para mais informação.
 
 Se você adicionar algo, ou reparar um erro, envie por favor um remendo
-(no formato 'diff -u') à lista wine-patches@winehq.com para inclusão na 
+(no formato 'diff -u') à lista wine-patches@winehq.org para inclusão na 
 próxima distribuição.
 
 --
 Alexandre Julliard
-julliard@winehq.com
+julliard@winehq.org
 
 --
 Tradução para Português do Brasil: Marcelo Duarte
diff --git a/documentation/bugs.sgml b/documentation/bugs.sgml
index b493102..60e5b8e 100644
--- a/documentation/bugs.sgml
+++ b/documentation/bugs.sgml
@@ -180,7 +180,7 @@
 
       <para>
         Please report all bugs along any relevant information to
-	<ulink url="http://bugs.winehq.com/">Wine Bugzilla</ulink>.
+	<ulink url="http://bugs.winehq.org/">Wine Bugzilla</ulink>.
         Please, search the Bugzilla database to check whether your problem
         is already reported. If it is already reported please add
         any relevant information to the original bug report.
@@ -330,7 +330,7 @@
              <listitem>
              <para>
                Post the bug to
-               <ulink url="http://bugs.winehq.com/">Wine Bugzilla</ulink>.
+               <ulink url="http://bugs.winehq.org/">Wine Bugzilla</ulink>.
                Please, search Bugzilla database to check whether your problem is
                already found before posting a bug report.
                Include your own detailed description of the problem with
@@ -411,7 +411,7 @@
           </para>
           <para>
             Post the bug to 
-            <ulink url="http://bugs.winehq.com/">Wine Bugzilla</ulink>.
+            <ulink url="http://bugs.winehq.org/">Wine Bugzilla</ulink>.
             You need to attach the output file <filename>report_file</filename>
             from part 2). Along with the the relevant information 
             used to create it. Do not cut and paste the report
diff --git a/documentation/configuring.sgml b/documentation/configuring.sgml
index fb85f43..72d9e64 100644
--- a/documentation/configuring.sgml
+++ b/documentation/configuring.sgml
@@ -913,7 +913,7 @@
         <para>
           There is always a chance that things will go wrong. If the
           unthinkable happens, report the problem to
-  	  <ulink url="http://bugs.winehq.com/">Wine Bugzilla</ulink>,
+  	  <ulink url="http://bugs.winehq.org/">Wine Bugzilla</ulink>,
   	  try the newsgroup
           <systemitem>comp.emulators.ms-windows.wine</systemitem>,
   	  or the IRC channel <systemitem>#WineHQ</systemitem> found on
@@ -2974,7 +2974,7 @@
       <para>
         from your main Wine directory, then submit
         <filename>layout.diff</filename> to
-        <email>wine-patches@winehq.com</email> along with a brief note
+        <email>wine-patches@winehq.org</email> along with a brief note
         of what it is.
       </para>
       <para>
diff --git a/documentation/cvs-regression.sgml b/documentation/cvs-regression.sgml
index e825791..43c7678 100644
--- a/documentation/cvs-regression.sgml
+++ b/documentation/cvs-regression.sgml
@@ -55,7 +55,7 @@
         </para>
         <note>
           <para>
-            If you use CVS directly from the winehq.com server, do not
+            If you use CVS directly from the winehq.org server, do not
             forget to add to your <filename>.cvsrc</filename> file:
           </para>
           <screen>
@@ -80,8 +80,8 @@
           Using the CST date format ensure that you will be able to
           extract patches in a way that will be compatible with the
           wine-cvs archive
-          <ulink url="http://www.winehq.com/hypermail/wine-cvs">
-          http://www.winehq.com/hypermail/wine-cvs</ulink>
+          <ulink url="http://www.winehq.org/hypermail/wine-cvs">
+          http://www.winehq.org/hypermail/wine-cvs</ulink>
         </para>
         <para>
           Many messages will inform you that more recent files have
@@ -134,7 +134,7 @@
         <para>
           If you find the patch that is the cause of the problem, you have
           almost won; report about it to
-          <ulink url="http://bugs.winehq.com/">Wine Bugzilla</ulink>
+          <ulink url="http://bugs.winehq.org/">Wine Bugzilla</ulink>
           or subscribe to wine-devel and post it there. There is a chance
           that the author
           will jump in to suggest a fix; or there is always the possibility
diff --git a/documentation/documentation.sgml b/documentation/documentation.sgml
index ac1f59e..ac7774e 100644
--- a/documentation/documentation.sgml
+++ b/documentation/documentation.sgml
@@ -1661,7 +1661,7 @@
               <listitem>
                 <para>
                   Hyperlink in URL form, e.g., <ulink
-                  url="http://www.winehq.com">http://www.winehq.com</ulink>.
+                  url="http://www.winehq.org">http://www.winehq.org</ulink>.
                 </para>
               </listitem>
             </varlistentry>
diff --git a/documentation/faq.sgml b/documentation/faq.sgml
index b058eff..0255434 100644
--- a/documentation/faq.sgml
+++ b/documentation/faq.sgml
@@ -9,7 +9,7 @@
       </question>
       <answer>
         <para>Dave Gardner maintained it from 1995-1998.</para>
-        <para>Douglas Ridgway (ridgway@winehq.com) took it over in 1999.</para>
+        <para>Douglas Ridgway (ridgway@winehq.org) took it over in 1999.</para>
         <para>Andreas Mohr (amohr@codeweavers.com) converted it to FAQ-O-Matic in 2000.</para>
         <para>Dimitrie O. Paun, Keith Matthews and Tom Wickline (in alphabetical order) reorganized it in 2002.</para>
         <para>For suggestions/additions/complaints regarding this FAQ, please send an email to
@@ -283,7 +283,7 @@
         <variablelist>
 
 	  <varlistentry>
-           <term><ulink url="http://www.winehq.com">Wine</ulink></term>
+           <term><ulink url="http://www.winehq.org">Wine</ulink></term>
            <listitem>
            <para>
               This is the "standard" source distribution of Wine. Its license is 
@@ -403,8 +403,8 @@
           applications became popular.
         </para>
         <para>
-          For more information, see <ulink url="http://www.winehq.com/site/about">
-          http://www.winehq.com/site/about</ulink>
+          For more information, see <ulink url="http://www.winehq.org/site/about">
+          http://www.winehq.org/site/about</ulink>
         </para>
       </answer>
       </qandaentry>
@@ -419,9 +419,9 @@
           able to keep up on all the latest releases by reading the newsgroup
           <ulink url="news:comp.emulators.ms-windows.wine">
           comp.emulators.ms-windows.wine</ulink>, or by visiting the
-          <ulink url="http://www.winehq.com">Wine HQ homepage</ulink>. When
+          <ulink url="http://www.winehq.org">Wine HQ homepage</ulink>. When
           downloading Wine from your FTP site of choice (see
-          <ulink url="http://www.winehq.com/download.shtml">the Download page</ulink>
+          <ulink url="http://www.winehq.org/download.shtml">the Download page</ulink>
           for some of these choices), you can make sure that you are getting 
           the latest version by watching the version numbers in the distribution
           file name. For instance, the distribution released on August 13, 2003
@@ -1127,7 +1127,7 @@
           To login to the CVS tree, do
         </para>
         <screen>
-export CVSROOT=:pserver:cvs@cvs.winehq.com/home/wine
+export CVSROOT=:pserver:cvs@cvs.winehq.org/home/wine
 cvs login
         </screen>
         <para>
@@ -1150,8 +1150,8 @@
           Be aware, though, that getting the entire Wine source tree via CVS
           is pretty slow, especially compared to getting Wine from an FTP 
           mirror near you. For a CVS mirror list, see 
-          <ulink url="http://www.winehq.com/site/cvs#cvsservers">
-          http://www.winehq.com/site/cvs#cvsservers</ulink>
+          <ulink url="http://www.winehq.org/site/cvs#cvsservers">
+          http://www.winehq.org/site/cvs#cvsservers</ulink>
         </para>
         <para>
           Patch files are also available, so that you don't have to download,
@@ -1196,7 +1196,7 @@
           does. Use a <filename>wine.sup</filename> file of:
         </para>
         <screen>
-*default host=cvs.winehq.com
+*default host=cvs.winehq.org
 *default base=/cvs
 *default prefix=/cvs/wine
 *default release=wine
@@ -1653,8 +1653,8 @@
         <para>
           Updates and additions to the Wine documentation directory should be
           sent to the wine-patches mailing list at 
-          <ulink url="http://www.winehq.com/site/forums">
-          http://www.winehq.com/site/forums</ulink>. Website and FAQ 
+          <ulink url="http://www.winehq.org/site/forums">
+          http://www.winehq.org/site/forums</ulink>. Website and FAQ 
           additions should be added to the appropriate Wine Knowledge base directory.
         </para>
       </answer>
@@ -1706,7 +1706,7 @@
       </question>
       <answer>
         <para>
-          Wine HQ (<ulink url="http://www.winehq.com">http://www.winehq.com</ulink>) is the official site.
+          Wine HQ (<ulink url="http://www.winehq.org">http://www.winehq.org</ulink>) is the official site.
         </para>
       </answer>
       </qandaentry>
@@ -1735,7 +1735,7 @@
       <answer>
         <para>
           Bug reports should be submitted to our online Bugzilla system 
-          (<ulink url="http://bugs.winehq.com/">http://bugs.winehq.com/</ulink>).
+          (<ulink url="http://bugs.winehq.org/">http://bugs.winehq.org/</ulink>).
           You should include at least the following:
         </para>
         <itemizedlist>
@@ -1784,11 +1784,11 @@
       <answer>
         <para>
           If you can program C, that's a good start. Download the sources via
-          (<ulink url="http://www.winehq.com/site/cvs">CVS,</ulink>)
+          (<ulink url="http://www.winehq.org/site/cvs">CVS,</ulink>)
           subscribe to the mailing lists, look around the source, and
           pay attention to the comp.emulators.ms-windows.wine newsgroup
           and the mailing lists (<ulink
-          url="http://www.winehq.com/site/forums">http://www.winehq.com/site/forums</ulink>).
+          url="http://www.winehq.org/site/forums">http://www.winehq.org/site/forums</ulink>).
           See if there's anything that you think you can fix or work
           on. You won't have much trouble finding areas that need work
           in Wine (grep for FIXMEs in the source).
@@ -1808,7 +1808,7 @@
         </para>
         <para>
           For a list of ideas of how you can help, please consult the 
-          <ulink url="http://www.winehq.com/site/contributing">
+          <ulink url="http://www.winehq.org/site/contributing">
           Wine contrib page</ulink>.
         </para>
       </answer>
@@ -1842,7 +1842,7 @@
           (<ulink url="http://www.winehq.org/mailman/listinfo/wine-patches">http://www.winehq.org/mailman/listinfo/wine-patches</>).
           Still there are a couple of recommendations about the patch format
           and all so it's best to read our page describing <ulink
-          url="http://www.winehq.com/site/sending_patches">how to submit
+          url="http://www.winehq.org/site/sending_patches">how to submit
           patches</>. This will also give you more details about the whole
           process and in particular to what will happen to your patch once
           submitted.
diff --git a/documentation/fonts.sgml b/documentation/fonts.sgml
index 5d6c021..a1e2000 100644
--- a/documentation/fonts.sgml
+++ b/documentation/fonts.sgml
@@ -11,7 +11,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/development/">http://www.winehq.com/development/</ulink>
+            <ulink url="http://www.winehq.org/development/">http://www.winehq.org/development/</ulink>
           </para>
         </note>
       </para>
diff --git a/documentation/getting.sgml b/documentation/getting.sgml
index 566711c..41b0c62 100644
--- a/documentation/getting.sgml
+++ b/documentation/getting.sgml
@@ -327,7 +327,7 @@
         <para>
           The first place you should look if your system isn't
           specifically mentioned above is the <ulink
-          url="http://www.winehq.com/download/">WineHQ Download
+          url="http://www.winehq.org/download/">WineHQ Download
           Page</ulink>.  This page lists many assorted archives of
           binary (precompiled) Wine files.
         </para>
@@ -384,7 +384,7 @@
         a bug in Wine, reported it to the
         <ulink url="http://bugs.winehq.org">Wine Bugzilla</ulink>
         or the
-        <ulink url="mailto:wine-devel@winehq.com">Wine mailing list</ulink>,
+        <ulink url="mailto:wine-devel@winehq.org">Wine mailing list</ulink>,
         and received a patch from a developer to hopefully fix the
         bug.  We will show you how to
         <link linkend="getting-upgrading-patch">safely apply the
@@ -397,7 +397,7 @@
         <para>
           The safest way to grab the source is from one of the official
           FTP archives.  An up to date listing is in the <ulink
-          url="http://www.winehq.com/source/ANNOUNCE">ANNOUNCE</ulink>
+          url="http://www.winehq.org/source/ANNOUNCE">ANNOUNCE</ulink>
           file in the Wine distribution (which you would have if you
           already downloaded it).  Here is a list
           of FTP servers carrying Wine:
@@ -540,7 +540,7 @@
 	    First, let's do the server login:
 	  </para>
   <screen>
-  <prompt>$ </><userinput>cvs -d :pserver:cvs@cvs.winehq.com:/home/wine login</>
+  <prompt>$ </><userinput>cvs -d :pserver:cvs@cvs.winehq.org:/home/wine login</>
   </screen>
 	  <para>
 	    If <command>cvs</command> successfully connects to the CVS server,
@@ -560,7 +560,7 @@
 	    To download the Wine tree into the subdirectory <filename>wine/</filename>, run:
 	  </para>
   <screen>
-  <prompt>$ </><userinput>cvs -d :pserver:cvs@cvs.winehq.com:/home/wine checkout wine</>
+  <prompt>$ </><userinput>cvs -d :pserver:cvs@cvs.winehq.org:/home/wine checkout wine</>
   </screen>
 	  <para>
 	    Downloading the CVS tree might take a while (some minutes
@@ -614,7 +614,7 @@
 	</para>
   <screen>
   <prompt>$ </><userinput>make distclean</>
-  <prompt>$ </><userinput>cvs -d :pserver:cvs@cvs.winehq.com:/home/wine update</>
+  <prompt>$ </><userinput>cvs -d :pserver:cvs@cvs.winehq.org:/home/wine update</>
   </screen>
 	<para>
 	  The <command>make distclean</command> part is optional, but
@@ -632,7 +632,7 @@
 	  have the option of applying patches to the source tree to
 	  update to a newer Wine release or to fix bugs and add
 	  experimental features.  Perhaps you've found a bug, reported
-	  it to the <ulink url="mailto:wine-devel@winehq.com">Wine
+	  it to the <ulink url="mailto:wine-devel@winehq.org">Wine
 	  mailing list</>, and received a patch file to fix the bug.
 	  You can apply the patch with the <command>patch</> command,
 	  which takes a streamed patch from <filename>stdin</>:
diff --git a/documentation/introduction.sgml b/documentation/introduction.sgml
index 294b5cc..b1229b8 100644
--- a/documentation/introduction.sgml
+++ b/documentation/introduction.sgml
@@ -28,7 +28,7 @@
           that should have been included, please immediately mail to the 
 	  <ulink url="mailto:wine-devel@winehq.org">wine-devel</ulink>, or
           post a bug report to
-          <ulink url="http://bugs.winehq.com/">Wine's Bugzilla</ulink> to
+          <ulink url="http://bugs.winehq.org/">Wine's Bugzilla</ulink> to
           let us know how this document can be improved.  Remember, Open
           Source is "free as in free speech, not as in free beer": it can
           only work in the case of very active involvement of its users!
diff --git a/documentation/testing.sgml b/documentation/testing.sgml
index 0f49b83..eee793b 100644
--- a/documentation/testing.sgml
+++ b/documentation/testing.sgml
@@ -272,7 +272,7 @@
           <listitem><para>
             If you get an error when compiling <filename>winsock.h</> then
             you probably need to apply the following patch:
-            <ulink url="http://www.winehq.com/hypermail/wine-patches/2002/12/0157.html">http://www.winehq.com/hypermail/wine-patches/2002/12/0157.html</>
+            <ulink url="http://www.winehq.org/hypermail/wine-patches/2002/12/0157.html">http://www.winehq.org/hypermail/wine-patches/2002/12/0157.html</>
           </para></listitem>
         </itemizedlist>
       </sect2>
diff --git a/documentation/wine.man.in b/documentation/wine.man.in
index 63c54c8..4e7358a 100644
--- a/documentation/wine.man.in
+++ b/documentation/wine.man.in
@@ -286,11 +286,11 @@
 .SH BUGS
 .PP
 A status report on many applications is available from
-.I http://www.winehq.com/Apps.
+.I http://www.winehq.org/Apps.
 Please add entries to this list for applications you currently run.
 .PP
 Bug reports may be posted to Wine Bugzilla
-.I http://bugs.winehq.com
+.I http://bugs.winehq.org
 If you want to post a bug report, please read the file
 .I documentation/bugs.sgml
 in the 
@@ -298,7 +298,7 @@
 source to see what information is necessary
 .PP
 Problems and suggestions with this manpage please also report to
-.I http://bugs.winehq.com
+.I http://bugs.winehq.org
 .SH AVAILABILITY
 The most recent public version of 
 .B wine
@@ -312,12 +312,12 @@
 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/development/
+http://www.winehq.org/development/
 .PP
 WineHQ, the
 .B wine
 development headquarters, is at
-.I http://www.winehq.com/.
+.I http://www.winehq.org/.
 This website contains a great deal of information about
 .B wine.
 .PP
@@ -333,7 +333,7 @@
 development, you might want to subscribe to the 
 .B wine 
 mailing lists at
-.I http://www.winehq.com/development/#ml
+.I http://www.winehq.org/development/#ml
 .SH FILES
 .PD 0
 .TP
diff --git a/documentation/winelib-bindlls.sgml b/documentation/winelib-bindlls.sgml
index faad7a8..0e59a62 100644
--- a/documentation/winelib-bindlls.sgml
+++ b/documentation/winelib-bindlls.sgml
@@ -95,7 +95,7 @@
 # linux library libMyLinux)
 #
 # For further details of wine spec files see the Winelib documentation at
-# www.winehq.com
+# www.winehq.org
 
 2 stdcall MyWinFunc (long ptr ptr ptr ptr long long ptr) MyProxyWinFunc
 
diff --git a/documentation/winelib-intro.sgml b/documentation/winelib-intro.sgml
index 0e1608c..b890a07 100644
--- a/documentation/winelib-intro.sgml
+++ b/documentation/winelib-intro.sgml
@@ -172,7 +172,7 @@
         <para>
           If you come across problems preparing and building this application
           this probably means that winemaker utility is broken by some changes
-          in Wine. Try asking for help on <email>wine-devel@winehq.com</email>
+          in Wine. Try asking for help on <email>wine-devel@winehq.org</email>
         </para>
       </sect2>
 
diff --git a/documentation/winelib-porting.sgml b/documentation/winelib-porting.sgml
index 65a6cda..a4c4400 100644
--- a/documentation/winelib-porting.sgml
+++ b/documentation/winelib-porting.sgml
@@ -145,7 +145,7 @@
       <para>
         If you come across a difference between the Windows headers
         and Wine's that breaks compilation, try asking for help on
-        <email>wine-devel@winehq.com</email>.
+        <email>wine-devel@winehq.org</email>.
       </para>
     </sect1>
 
diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc
index a6d4ddc..9a530d2 100644
--- a/programs/winecfg/En.rc
+++ b/programs/winecfg/En.rc
@@ -37,7 +37,7 @@
     LTEXT           "DOS Version:",IDC_STATIC,17,173,57,8
     CONTROL         IDB_WINE,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE | 
                     SS_REALSIZEIMAGE | WS_BORDER,15,17,157,111, WS_EX_TRANSPARENT
-    LTEXT           "http://www.winehq.com/",IDC_STATIC,119,31,106,8
+    LTEXT           "http://www.winehq.org/",IDC_STATIC,119,31,106,8
     GROUPBOX        "Default Behaviour",IDC_STATIC,8,115,244,97
     LTEXT           "Wine provides the ability for Windows applications to mimic various Windows versions and styles",
                     IDC_STATIC,15,128,227,20
diff --git a/programs/winecfg/Es.rc b/programs/winecfg/Es.rc
index b573941..7db0ce8 100644
--- a/programs/winecfg/Es.rc
+++ b/programs/winecfg/Es.rc
@@ -36,7 +36,7 @@
     LTEXT           "Versión de DOS:",IDC_STATIC,17,173,57,8
     CONTROL         IDB_WINE,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE | 
                     SS_REALSIZEIMAGE | WS_BORDER,15,17,157,111, WS_EX_TRANSPARENT
-    LTEXT           "http://www.winehq.com/",IDC_STATIC,119,31,106,8
+    LTEXT           "http://www.winehq.org/",IDC_STATIC,119,31,106,8
     GROUPBOX        "Comportamiento por defecto",IDC_STATIC,8,115,244,97
     LTEXT           "Wine permite a las aplicaciones Windows imitar distintas versiones y estilos de Windows",
                     IDC_STATIC,15,128,227,20
diff --git a/programs/winecfg/Pt.rc b/programs/winecfg/Pt.rc
index 5ecb345..104fbae 100644
--- a/programs/winecfg/Pt.rc
+++ b/programs/winecfg/Pt.rc
@@ -36,7 +36,7 @@
     LTEXT           "Versão do DOS:",IDC_STATIC,17,173,57,8
     CONTROL         IDB_WINE,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE | 
                     SS_REALSIZEIMAGE | WS_BORDER,15,17,157,111, WS_EX_TRANSPARENT
-    LTEXT           "http://www.winehq.com/",IDC_STATIC,119,31,106,8
+    LTEXT           "http://www.winehq.org/",IDC_STATIC,119,31,106,8
     GROUPBOX        "Comportamento padrão",IDC_STATIC,8,115,244,97
     LTEXT           "Wine providencia a aplicações Windows, a habilidade de se parecer a várias versões e estilos de Windows",
                     IDC_STATIC,15,128,227,20
diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc
index c93879a..06dab1a 100644
--- a/programs/winecfg/Ru.rc
+++ b/programs/winecfg/Ru.rc
@@ -46,7 +46,7 @@
     LTEXT           "Âåðñèÿ DOS:",IDC_STATIC,17,173,57,8
     CONTROL         IDB_WINE,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE | 
                     SS_REALSIZEIMAGE | WS_BORDER,15,17,157,111, WS_EX_TRANSPARENT
-    LTEXT           "http://www.winehq.com/",IDC_STATIC,119,31,106,8
+    LTEXT           "http://www.winehq.org/",IDC_STATIC,119,31,106,8
     GROUPBOX        "Ïîâåäåíèå ïî óìîë÷àíèþ",IDC_STATIC,8,115,244,97
     LTEXT           "Wine ïðåäîñòàâëÿåò âîçìîæíîñòü äëÿ Windows-ïðèëîæåíèé èìèòèðîâàòü ðàçëè÷íûå âåðñèè è âíåøíèé âèä Windows.",
                     IDC_STATIC,15,128,227,20
diff --git a/programs/winecfg/Si.rc b/programs/winecfg/Si.rc
index 1a8960a..294e593 100644
--- a/programs/winecfg/Si.rc
+++ b/programs/winecfg/Si.rc
@@ -36,7 +36,7 @@
     LTEXT           "DOS Version:",IDC_STATIC,17,173,57,8
     CONTROL         IDB_WINE,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE | 
                     SS_REALSIZEIMAGE | WS_BORDER,15,17,157,111, WS_EX_TRANSPARENT
-    LTEXT           "http://www.winehq.com/",IDC_STATIC,119,31,106,8
+    LTEXT           "http://www.winehq.org/",IDC_STATIC,119,31,106,8
     GROUPBOX        "Default Behaviour",IDC_STATIC,8,115,244,97
     LTEXT           "Wine provides the ability for Windows applications to mimic various Windows versions and styles",
                     IDC_STATIC,15,128,227,20
diff --git a/tools/bug_report.pl b/tools/bug_report.pl
index ed7c617..7885a9c 100755
--- a/tools/bug_report.pl
+++ b/tools/bug_report.pl
@@ -76,7 +76,7 @@
 	the second has *all* of the debug output, which can go to thousands of
 	lines.
 	To (hopefully) get the bug fixed, report it to the project
-	bug tracking system at http://bugs.winehq.com.
+	bug tracking system at http://bugs.winehq.org.
 	Attach the first file to the bug description.
 	Also include detailed description of the problem. The developers
 	might ask you for "the last X lines from the report". If so, just
@@ -563,7 +563,7 @@
 EOM
 }
 $var22 = qq{
-Great! We're finished making the debug report. Please go to http://bugs.winehq.com
+Great! We're finished making the debug report. Please go to http://bugs.winehq.org
 and enter it as a new bug. Check that nobody has already reported the same bug!
 };
 $var28 = qq{
@@ -577,7 +577,7 @@
 };
 $var30 = qq{
 If you have any problems with this bug reporting tool,
-please submit a bug report to Wine bugtracking system at http://bugs.winehq.com
+please submit a bug report to Wine bugtracking system at http://bugs.winehq.org
 or tell the Wine newsgroup (comp.emulators.ms-windows.wine).
 };
 print do_var($var22);
diff --git a/tools/genpatch b/tools/genpatch
index d390650..6d430c3 100755
--- a/tools/genpatch
+++ b/tools/genpatch
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 #
 # genpatch - A utility that generates patches for submission to
-# wine-patches@winehq.com
+# wine-patches@winehq.org
 #
 # Copyright Steven Elliott <elliotsl@mindspring.com>
 #
@@ -23,7 +23,7 @@
 =head1 NAME
 
 genpatch - A utility that generates patches for submission to
-wine-patches@winehq.com
+wine-patches@winehq.org
 
 =head1 SYNOPSIS
 
diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in
index 6fb84ad..ffd80cd 100644
--- a/tools/winebuild/winebuild.man.in
+++ b/tools/winebuild/winebuild.man.in
@@ -412,8 +412,8 @@
 specification; only Wine dlls can be imported.
 .PP
 If you find a bug, please submit a bug report at
-.UR http://bugs.winehq.com
-.B http://bugs.winehq.com.
+.UR http://bugs.winehq.org
+.B http://bugs.winehq.org.
 .UE
 .SH AVAILABILITY
 .B winebuild
@@ -421,8 +421,8 @@
 the
 .B wine
 development headquarters, at
-.UR http://www.winehq.com/
-.B http://www.winehq.com/.
+.UR http://www.winehq.org/
+.B http://www.winehq.org/.
 .UE
 .SH "SEE ALSO"
 .BR wine (1),
diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h
index dd2ce99..c65e012 100644
--- a/tools/winedump/winedump.h
+++ b/tools/winedump/winedump.h
@@ -20,7 +20,7 @@
  *  References:
  *  DLL symbol extraction based on file format from alib (anthonyw.cjb.net).
  *
- *  Option processing shamelessly cadged from winebuild (www.winehq.com).
+ *  Option processing shamelessly cadged from winebuild.
  *
  *  All the cool functionality (prototyping, call tracing, forwarding)
  *  relies on Patrik Stridvall's 'function_grep.pl' script to work.
diff --git a/tools/wineinstall b/tools/wineinstall
index f4c17ee..f6c9151 100755
--- a/tools/wineinstall
+++ b/tools/wineinstall
@@ -328,7 +328,7 @@
              echo "run '$sucommand' correctly."
              echo "If you didn't enter an incorrect password then please"
              echo "report this error and any steps to possibly reproduce it to"
-             echo "http://bugs.winehq.com/"
+             echo "http://bugs.winehq.org/"
              echo
              echo "Installation failed, aborting."
              exit 1
diff --git a/tools/wmc/wmc.man b/tools/wmc/wmc.man
index ec5cdcb..d8da0a8 100644
--- a/tools/wmc/wmc.man
+++ b/tools/wmc/wmc.man
@@ -97,7 +97,7 @@
 WineHQ, the
 .B wine
 development headquarters, at
-.I http://www.winehq.com/.
+.I http://www.winehq.org/.
 .SH "SEE ALSO"
 .BR wine (1),
 .BR wrc (1)
diff --git a/tools/wrc/wrc.man b/tools/wrc/wrc.man
index f771332..4e1d70f 100644
--- a/tools/wrc/wrc.man
+++ b/tools/wrc/wrc.man
@@ -194,6 +194,6 @@
 .B wrc
 is part of the Wine distribution, which is available through
 WineHQ, the Wine development headquarters, at
-.I http://www.winehq.com/.
+.I http://www.winehq.org/.
 .SH "SEE ALSO"
 .BR wine (1)