diff --git a/README.md b/README.md
index 006cb9c79..b31c67fb0 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,12 @@
 MusicBrainz Picard
 ==================
 
-[MusicBrainz Picard](http://musicbrainz.org/doc/MusicBrainz_Picard) is a cross-platform (Linux/Mac OS X/Windows) application written in Python and is the official [MusicBrainz](http://musicbrainz.org) tagger.
+[MusicBrainz Picard](http://picard.musicbrainz.org) is a cross-platform (Linux/Mac OS X/Windows) application written in Python and is the official [MusicBrainz](http://musicbrainz.org) tagger.
 
 Picard supports the majority of audio file formats, is capable of using audio fingerprints ([AcoustIDs](http://musicbrainz.org/doc/AcoustID)), performing CD lookups and [disc ID](http://musicbrainz.org/doc/Disc_ID) submissions, and it has excellent Unicode support. Additionally, there are several plugins available that extend Picard's features.
 
-When tagging files, Picard uses an album-oriented approach. This approach allows it to utilize the MusicBrainz data as effectively as possible and correctly tag your music. For more information, [see the illustrated quick start guide to tagging](http://musicbrainz.org/doc/How_To_Tag_Files_With_Picard).
+When tagging files, Picard uses an album-oriented approach. This approach allows it to utilize the MusicBrainz data as effectively as possible and correctly tag your music. For more information, [see the illustrated quick start guide to tagging](http://picard.musicbrainz.org/docs/guide/).
 
 Picard is named after Captain Jean-Luc Picard from the TV series Star Trek: The Next Generation.
 
-Binary downloads are available [here](http://musicbrainz.org/doc/MusicBrainz_Picard).
-
-To submit bugs or improvements, please use [Picard bug tracker](http://tickets.musicbrainz.org/browse/PICARD).
+Binary downloads are available [here](http://picard.musicbrainz.org/downloads/).
diff --git a/picard/const.py b/picard/const.py
index 8d96bc491..f7df3aa22 100644
--- a/picard/const.py
+++ b/picard/const.py
@@ -48,11 +48,11 @@ CAA_PORT = 80
 
 # URLs
 PICARD_URLS = {
-    'documentation':    "http://musicbrainz.org/doc/MusicBrainz_Picard/Documentation",
-    'troubleshooting':  "http://musicbrainz.org/doc/MusicBrainz_Picard/Troubleshooting",
-    'home':             "http://musicbrainz.org/doc/MusicBrainz_Picard",
-    'doc_options':      "http://musicbrainz.org/doc/MusicBrainz_Picard/Documentation/Options",
-    'plugins':          "http://musicbrainz.org/doc/MusicBrainz_Picard/Plugins",
+    'documentation':    "http://picard.musicbrainz.org/docs/",
+    'troubleshooting':  "http://picard.musicbrainz.org/docs/troubleshooting/",
+    'home':             "http://picard.musicbrainz.org/",
+    'doc_options':      "http://picard.musicbrainz.org/docs/options/",
+    'plugins':          "http://picard.musicbrainz.org/plugins/",
     'forum':            "http://forums.musicbrainz.org/viewforum.php?id=2",
     'donate':           "http://metabrainz.org/donate",
     'chromaprint':      "http://acoustid.org/chromaprint#download",