diff --git a/appsubmit.php b/appsubmit.php
index b611f8f..c3de882 100644
--- a/appsubmit.php
+++ b/appsubmit.php
@@ -122,8 +122,7 @@ else if (isset($_REQUEST['apptype']))
   echo "and if any workaround were needed. Having app descriptions just sponsoring the app\n";
   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.org'>appdb@winehq.org</a></p>\n";
+  echo "<p>After your application has been added you'll be able to submit screenshots for it.</p>";
 
   # NEW APPLICATION
   if ($_REQUEST['apptype'] == 1)
diff --git a/help/index.php b/help/index.php
index d97ee43..d409722 100644
--- a/help/index.php
+++ b/help/index.php
@@ -51,7 +51,7 @@ function display_index ()
 
     echo "</ul><hr noshade>\n";
 
-    echo "<p>Need more help? Contact us at <a href='mailto:appdb@winehq.org'>appdb@winehq.org</a><p>\n";
+    echo "<p>Need more help? Contact us at <a href='mailto:".APPDB_OWNER_EMAIL."'>".APPDB_OWNER_EMAIL."</a><p>\n";
         
     apidb_footer();
 }
diff --git a/index.php b/index.php
index c44f97a..3726573 100644
--- a/index.php
+++ b/index.php
@@ -65,10 +65,8 @@ If you have screenshots or links to contribute, please browse the database and u
 ?>
 <p>
 If you have anything else to contribute (howtos, etc.), enroll to be an application maintainer or contact us at:
-<a href="mailto:appdb@winehq.org">appdb@winehq.org</a><br />
-Note that this address is not for end-user support, for end user support please contact the
-wine-users mailing list or the wine newsgroup, for more information visit
-<a href="http://www.winehq.com/site/forums">this page</a>
+<a href="mailto:<?php echo APPDB_OWNER_EMAIL;?>"><?php echo APPDB_OWNER_EMAIL;?></a><br />
+Note that this address is not for end-user support, for end user support please use the mailing lists or newsgroups that you'll find on the <a href="<?php echo APPDB_OWNER_URL;?>">main website</a>.
 </p>
 <?php
 
diff --git a/support.php b/support.php
index 33d5a23..d96b1ed 100644
--- a/support.php
+++ b/support.php
@@ -15,8 +15,8 @@ apidb_header("Help and Support");
 <p><big><b>Who Can Help Me Out?</b></big></p>
 
 <p>
-If you have questions, comments on the Wine Application Database, you can contact
-us at <a href="mailto:appdb@winehq.org">appdb@winehq.org</a>.
+If you have questions, comments on the Application Database, you can contact
+us at <a href="mailto:<?php echo APPDB_OWNER_EMAIL;?>"><?php echo APPDB_OWNER_EMAIL;?></a>.
 </p>
 
 <p>
@@ -29,11 +29,11 @@ to the App DB Bug Database by following this
 </p>
 
 <p>
-If you need more information on the Wine Project itself, there are plenty of resources.
+If you need more information on this project, there are plenty of resources.
 </p>
 
 <ul>
-   <li><a href="http://www.winehq.org">Wine Development HQ</a></li>
+   <li><a href="<?php echo APPDB_OWNER_URL;?>"><?php echo APPDB_OWNER;?></a></li>
    <li><a href="http://www.codeweavers.com">CodeWeavers Home Page</a></li>
 </ul>	
 <?php