diff --git a/NEWS b/NEWS
index 0575b6cc7..37071507b 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ ver 0.15 - (200?/??/??)
   - parse Icy-Metadata
 * tags:
   - support the "album artist" tag
+  - support MusicBrainz tags
   - parse RVA2 tags in mp3 files
 * decoders:
   - audiofile: streaming support added
diff --git a/src/tag.c b/src/tag.c
index 23d786ec2..242ea7383 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -53,7 +53,13 @@ const char *mpdTagItemKeys[TAG_NUM_OF_ITEM_TYPES] = {
 	"Composer",
 	"Performer",
 	"Comment",
-	"Disc"
+	"Disc",
+
+	/* MusicBrainz tags from http://musicbrainz.org/doc/MusicBrainzTag */
+	[TAG_MUSICBRAINZ_ARTISTID] = "MUSICBRAINZ_ARTISTID",
+	[TAG_MUSICBRAINZ_ALBUMID] = "MUSICBRAINZ_ALBUMID",
+	[TAG_MUSICBRAINZ_ALBUMARTISTID] = "MUSICBRAINZ_ALBUMARTISTID",
+	[TAG_MUSICBRAINZ_TRACKID] = "MUSICBRAINZ_TACKID",
 };
 
 int8_t ignoreTagItems[TAG_NUM_OF_ITEM_TYPES];
diff --git a/src/tag.h b/src/tag.h
index 0c525b24b..ccaf301d0 100644
--- a/src/tag.h
+++ b/src/tag.h
@@ -39,6 +39,12 @@ enum tag_type {
 	TAG_ITEM_PERFORMER,
 	TAG_ITEM_COMMENT,
 	TAG_ITEM_DISC,
+
+	TAG_MUSICBRAINZ_ARTISTID,
+	TAG_MUSICBRAINZ_ALBUMID,
+	TAG_MUSICBRAINZ_ALBUMARTISTID,
+	TAG_MUSICBRAINZ_TRACKID,
+
 	TAG_NUM_OF_ITEM_TYPES
 };