diff --git a/beets/autotag/mb.py b/beets/autotag/mb.py
index fb2878dba..177411034 100644
--- a/beets/autotag/mb.py
+++ b/beets/autotag/mb.py
@@ -57,7 +57,6 @@ class MusicBrainzAPIError(util.HumanReadableException):
             self._reasonstr(), self.verb, repr(self.query)
         )
 
-
 log = logging.getLogger('beets')
 
 RELEASE_INCLUDES = ['artists', 'media', 'recordings', 'release-groups',
diff --git a/beets/library.py b/beets/library.py
index 36af5adf4..6d143ef16 100644
--- a/beets/library.py
+++ b/beets/library.py
@@ -452,7 +452,7 @@ class Item(LibModel):
         'composer':             types.STRING,
         'composer_sort':        types.STRING,
         'work':                 types.STRING,
-        'work_id':              types.STRING,
+        'mb_workid':            types.STRING,
         'work_disambig':        types.STRING,
         'arranger':             types.STRING,
         'grouping':             types.STRING,
diff --git a/beets/mediafile.py b/beets/mediafile.py
index d1508b762..1c07d64f8 100644
--- a/beets/mediafile.py
+++ b/beets/mediafile.py
@@ -1644,10 +1644,16 @@ class MediaFile(object):
         ASFStorageStyle('WM/Composersortorder'),
     )
     work = MediaField(
-        MP3DescStorageStyle(u'Work'),
-        MP4StorageStyle('----:com.apple.iTunes:Work'),
+        MP3StorageStyle('TIT1'),
+        MP4StorageStyle('\xa9wrk'),
         StorageStyle('WORK'),
-        ASFStorageStyle('beets/Work'),
+        ASFStorageStyle('WM/Work'),
+    )
+    mb_workid = MediaField(
+        MP3StorageStyle('TXXX:MusicBrainz Work Id'),
+        MP4StorageStyle('----:com.apple.iTunes:MusicBrainz Work Id'),
+        StorageStyle('MUSICBRAINZ_WORKID '),
+        ASFStorageStyle('MusicBrainz/Work Id'),
     )
     arranger = MediaField(
         MP3PeopleStorageStyle('TIPL', involvement='arranger'),