diff --git a/beets/mediafile.py b/beets/mediafile.py
index 567610ecc..48b212b83 100644
--- a/beets/mediafile.py
+++ b/beets/mediafile.py
@@ -1,5 +1,5 @@
 # This file is part of beets.
-# Copyright 2011, Adrian Sampson.
+# Copyright 2012, Adrian Sampson.
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -911,6 +911,18 @@ class MediaFile(object):
         etc = StorageStyle('MUSICBRAINZ_ALBUMCOMMENT'),
     )
 
+    # Nonstandard metadata.
+    artist_credit = MediaField(
+        mp3 = StorageStyle('TXXX', id3_desc=u'Artist Credit'),
+        mp4 = StorageStyle("----:com.apple.iTunes:Artist Credit"),
+        etc = StorageStyle('ARTIST_CREDIT'),
+    )
+    albumartist_credit = MediaField(
+        mp3 = StorageStyle('TXXX', id3_desc=u'Album Artist Credit'),
+        mp4 = StorageStyle("----:com.apple.iTunes:Album Artist Credit"),
+        etc = StorageStyle('ALBUMARTIST_CREDIT'),
+    )
+
     # Album art.
     art = ImageField()
 
diff --git a/test/test_mediafile_basic.py b/test/test_mediafile_basic.py
index 49ce522d1..b05693f0d 100644
--- a/test/test_mediafile_basic.py
+++ b/test/test_mediafile_basic.py
@@ -1,5 +1,5 @@
 # This file is part of beets.
-# Copyright 2011, Adrian Sampson.
+# Copyright 2012, Adrian Sampson.
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -239,6 +239,8 @@ correct_dicts = {
         'albumstatus':          u'',
         'media':                u'',
         'albumdisambig':        u'',
+        'artist_credit':        u'',
+        'albumartist_credit':   u'',
     },
 
     # Full release date.