diff --git a/appsubmit.php b/appsubmit.php
index a6c91a5..c78d122 100644
--- a/appsubmit.php
+++ b/appsubmit.php
@@ -114,7 +114,7 @@ else
 	echo "(Yes, some vendor want to use the appdb for this) or saying \"I haven't tried this app with wine\" ";
 	echo "won't help wine development or wine users.</p>\n";
 	echo "<p>To submit screenshots, please email them to ";
-	echo "<a href='mailto:appdb@winehq.com'>appdb@winehq.com</a></p>\n";
+	echo "<a href='mailto:appdb@winehq.org'>appdb@winehq.org</a></p>\n";
 
 	    echo html_frame_start("New Application Form",400,"",0);
 
diff --git a/help/appdb_faq.help b/help/appdb_faq.help
index 19a9138..46be2b7 100644
--- a/help/appdb_faq.help
+++ b/help/appdb_faq.help
@@ -52,7 +52,7 @@ reviewed and categorized by a maintainer.</p>
 <p><b>Q: How can I submit HowTo's and Screenshots?</b></p>
 <blockquote>
 <p><b>A:</b> We love to hear from our users. Send those helpful HowTo's and
-Screenshots right on over to <a href="mailto:appdb@winehq.com">appdb@winehq.com</a>.
+Screenshots right on over to <a href="mailto:appdb@winehq.org">appdb@winehq.org</a>.
 We'll be happy to post them, and give you proper credit for your great contribution.</p>
 </blockquote>
 
@@ -61,7 +61,7 @@ We'll be happy to post them, and give you proper credit for your great contribut
 <blockquote>
 <p><b>A:</b> Pretty much anyone with an established reputation supporting Wine
 is welcome (begged?) to be an application maintainer.
-Simply send email to <a href="mailto:appdb@winehq.com">appdb@winehq.com</a>
+Simply send email to <a href="mailto:appdb@winehq.org">appdb@winehq.org</a>
 to apply. Once we have a community of maintainers, we hope that community
 will further refine the policies and procedures.</p>
 </blockquote>
@@ -69,7 +69,7 @@ will further refine the policies and procedures.</p>
 </ul>
 
 If you have more questions you would like to add to our FAQ, please contact us
-at <a href="mailto:appdb@winehq.com">appdb@winehq.com</a>.
+at <a href="mailto:appdb@winehq.org">appdb@winehq.org</a>.
 
 <p>&nbsp;</p>
 
diff --git a/help/generic.help b/help/generic.help
index 5905b9b..f8b8eff 100644
--- a/help/generic.help
+++ b/help/generic.help
@@ -49,7 +49,7 @@ and you may also want to read the
 
 <ul>
 
-<li> You can ask for help on the <a href="http://www.winehq.com/mailman/listinfo/wine-users">wine-users</a>
+<li> You can ask for help on the <a href="http://www.winehq.org/mailman/listinfo/wine-users">wine-users</a>
 mailing list. </li>
 
 <li>WineHQ has a newsgroup hosted by Usenet. You can read and post using a
diff --git a/help/privacy.help b/help/privacy.help
index 16dc8bb..f0ac54e 100644
--- a/help/privacy.help
+++ b/help/privacy.help
@@ -33,7 +33,7 @@
 <b>Questions or Suggestions</b><br>
 <ul>
         If you have questions or suggestions, feel free to contact us at
-	<a href="mailto:appdb@winehq.com">appdb@winehq.com</a> 
+	<a href="mailto:appdb@winehq.org">appdb@winehq.org</a> 
 </ul>
 </p>
 
diff --git a/index.php b/index.php
index 56b49ee..ae99698 100644
--- a/index.php
+++ b/index.php
@@ -35,7 +35,7 @@ apidb_header("Wine Application Database");
 
 	<p>
 	If you have anything to contribute (screenshots, howtos), contact us at:
-	<a href="mailto:appdb@winehq.com">appdb@winehq.com</a>
+	<a href="mailto:appdb@winehq.org">appdb@winehq.org</a>
 	</p>
 <?