diff --git a/adapters/gotaglib/gotaglib_test.go b/adapters/gotaglib/gotaglib_test.go
index 8fdf5b406..6756fb690 100644
--- a/adapters/gotaglib/gotaglib_test.go
+++ b/adapters/gotaglib/gotaglib_test.go
@@ -127,6 +127,17 @@ var _ = Describe("Extractor", func() {
 				Expect(m.Tags).To(HaveKeyWithValue("albumartist", []string{"Album Artist"}))
 				Expect(m.Tags).To(HaveKeyWithValue("genre", []string{"Rock"}))
 				Expect(m.Tags).To(HaveKeyWithValue("date", []string{"2014"}))
+				// Still as of TagLib v2.2.1, TagLib only maps values in ID3, MP4, and ASF tags
+				// to `originaldate`.
+				if strings.HasSuffix(file, ".mp3") || strings.HasSuffix(file, ".wav") || strings.HasSuffix(file, ".aiff") || strings.HasSuffix(file, ".m4a") || strings.HasSuffix(file, ".wma") {
+					Expect(m.Tags).To(HaveKeyWithValue("originaldate", []string{"1996-11-21"}))
+				}
+				// MP3Tag sets `ORIGYEAR` in several formats for which it has no built-in mapping
+				// for original release dates.
+				Expect(m.Tags).To(Or(
+					HaveKeyWithValue("origyear", []string{"1998-07-28"}),
+					HaveKeyWithValue("----:com.apple.itunes:origyear", []string{"1998-07-28"}),
+				))
 
 				Expect(m.Tags).To(HaveKeyWithValue("bpm", []string{"123"}))
 				Expect(m.Tags).To(Or(
diff --git a/resources/mappings.yaml b/resources/mappings.yaml
index 19ba0b090..16dddd504 100644
--- a/resources/mappings.yaml
+++ b/resources/mappings.yaml
@@ -116,7 +116,7 @@ main:
     aliases: [ comm:description, comment, ©cmt, description, icmt ]
     maxLength: 4096
   originaldate:
-    aliases: [ tdor, originaldate, ----:com.apple.itunes:originaldate, wm/originalreleasetime, tory, originalyear, ----:com.apple.itunes:originalyear, wm/originalreleaseyear ]
+    aliases: [ tdor, originaldate, ----:com.apple.itunes:originaldate, wm/originalreleasetime, tory, originalyear, ----:com.apple.itunes:originalyear, wm/originalreleaseyear, origyear, ----:com.apple.itunes:origyear ]
     type: date
   recordingdate:
     aliases: [ tdrc, date, recordingdate, icrd, record date ]
diff --git a/tests/fixtures/01 Invisible (RED) Edit Version.m4a b/tests/fixtures/01 Invisible (RED) Edit Version.m4a
index 005792eb5..76b61a2d4 100644
Binary files a/tests/fixtures/01 Invisible (RED) Edit Version.m4a and b/tests/fixtures/01 Invisible (RED) Edit Version.m4a differ
diff --git a/tests/fixtures/test.aiff b/tests/fixtures/test.aiff
index 1435115d9..d179f0714 100644
Binary files a/tests/fixtures/test.aiff and b/tests/fixtures/test.aiff differ
diff --git a/tests/fixtures/test.flac b/tests/fixtures/test.flac
index 6c1270fd5..50430f539 100644
Binary files a/tests/fixtures/test.flac and b/tests/fixtures/test.flac differ
diff --git a/tests/fixtures/test.m4a b/tests/fixtures/test.m4a
index c469dd9e4..e9b54d44d 100644
Binary files a/tests/fixtures/test.m4a and b/tests/fixtures/test.m4a differ
diff --git a/tests/fixtures/test.mp3 b/tests/fixtures/test.mp3
index 7333249ad..18cb90674 100644
Binary files a/tests/fixtures/test.mp3 and b/tests/fixtures/test.mp3 differ
diff --git a/tests/fixtures/test.ogg b/tests/fixtures/test.ogg
index 507da9050..2b1deea98 100644
Binary files a/tests/fixtures/test.ogg and b/tests/fixtures/test.ogg differ
diff --git a/tests/fixtures/test.opus b/tests/fixtures/test.opus
index 5052c0e6e..044947c70 100644
Binary files a/tests/fixtures/test.opus and b/tests/fixtures/test.opus differ
diff --git a/tests/fixtures/test.wav b/tests/fixtures/test.wav
index 155d88bdb..b8c1f9a65 100644
Binary files a/tests/fixtures/test.wav and b/tests/fixtures/test.wav differ
diff --git a/tests/fixtures/test.wma b/tests/fixtures/test.wma
index 2edb7260e..2e7341cf5 100644
Binary files a/tests/fixtures/test.wma and b/tests/fixtures/test.wma differ
diff --git a/tests/fixtures/test.wv b/tests/fixtures/test.wv
index 3722d28a2..7f4118bdb 100644
Binary files a/tests/fixtures/test.wv and b/tests/fixtures/test.wv differ