diff --git a/NEWS.txt b/NEWS.txt
index 606c484ab..4aa95bebd 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -13,6 +13,7 @@ Version 0.9.0beta1 - 2007-XX-YY
    * ID3v2.3 frame TDAT should be written in format DDMM, not MMDD. (#2770)
    * Don't display an error on Ogg and FLAC files with no tags.
    * Remove video files from the list of supported formats.
+   * Always use musicbrainz.org for PUID submissions. (#2764)
 
 Version 0.9.0alpha8 - 2007-04-15
  * New Features:
diff --git a/picard/const.py b/picard/const.py
index 445caf78d..a13fe7da2 100644
--- a/picard/const.py
+++ b/picard/const.py
@@ -18,5 +18,19 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 
+# Host for PUID submissions
 PUID_SUBMIT_HOST = "musicbrainz.org"
 PUID_SUBMIT_PORT = 80
+
+# Amazon associate and developer ids
+AMAZON_STORE_ASSOCIATE_IDS = {
+    u'amazon.ca': u'musicbrainz01-20',
+    u'amazon.co.jp': u'musicbrainz-22',
+    u'amazon.co.uk': u'musicbrainz0c-21',
+    u'amazon.com': u'musicbrainz0d-20',
+    u'amazon.de': u'musicbrainz00-21',
+    u'amazon.fr': u'musicbrainz0e-21',
+}
+
+# MusicDNS client ID
+MUSICDNS_KEY = "0736ac2cd889ef77f26f6b5e3fb8a09c"
diff --git a/picard/musicdns/__init__.py b/picard/musicdns/__init__.py
index f601df6b1..0f06c6c20 100644
--- a/picard/musicdns/__init__.py
+++ b/picard/musicdns/__init__.py
@@ -23,13 +23,11 @@ try:
 except ImportError:
     ofa = None
 from picard import version_string
+from picard.const import MUSICDNS_KEY
 from picard.util import encode_filename, partial
 from picard.util.thread import spawn, proxy_to_main
 
 
-MUSICDNS_KEY = "0736ac2cd889ef77f26f6b5e3fb8a09c"
-
-
 class OFA(QtCore.QObject):
 
     def __init__(self):
diff --git a/picard/ui/coverartbox.py b/picard/ui/coverartbox.py
index 710b84d5f..f399f54ae 100644
--- a/picard/ui/coverartbox.py
+++ b/picard/ui/coverartbox.py
@@ -19,17 +19,7 @@
 
 from PyQt4 import QtCore, QtGui
 from picard.util import webbrowser2
-
-
-# Amazon associate and developer ids
-_amazon_store_associate_ids = {
-    u'amazon.ca': u'musicbrainz01-20',
-    u'amazon.co.jp': u'musicbrainz-22',
-    u'amazon.co.uk': u'musicbrainz0c-21',
-    u'amazon.com': u'musicbrainz0d-20',
-    u'amazon.de': u'musicbrainz00-21',
-    u'amazon.fr': u'musicbrainz0e-21',
-}
+from picard.const import AMAZON_STORE_ASSOCIATE_IDS
 
 
 class ActiveLabel(QtGui.QLabel):
@@ -113,6 +103,6 @@ class CoverArtBox(QtGui.QGroupBox):
         # TODO: make this configurable
         store = "amazon.com"
         url = "http://%s/exec/obidos/ASIN/%s/%s?v=glance&s=music" % (
-            store, self.asin, _amazon_store_associate_ids[store])
+            store, self.asin, AMAZON_STORE_ASSOCIATE_IDS[store])
         webbrowser2.open(url)