diff --git a/NEWS b/NEWS
index 9073a2a23..de55a0cd5 100644
--- a/NEWS
+++ b/NEWS
@@ -33,6 +33,7 @@ ver 0.19 (not yet released)
   - vorbis, flac, opus: honor DESCRIPTION= tag in Xiph-based files as a comment to the song
   - audiofile: support scanning remote files
   - audiofile: log libaudiofile errors
+  - sndfile: support tags "comment", "album", "track", "genre"
 * encoder:
   - shine: new encoder plugin
 * threads:
diff --git a/src/decoder/plugins/SndfileDecoderPlugin.cxx b/src/decoder/plugins/SndfileDecoderPlugin.cxx
index dbdd5d39b..58fec5b7b 100644
--- a/src/decoder/plugins/SndfileDecoderPlugin.cxx
+++ b/src/decoder/plugins/SndfileDecoderPlugin.cxx
@@ -228,7 +228,11 @@ static constexpr struct {
 } sndfile_tags[] = {
 	{ SF_STR_TITLE, TAG_TITLE },
 	{ SF_STR_ARTIST, TAG_ARTIST },
+	{ SF_STR_COMMENT, TAG_COMMENT },
 	{ SF_STR_DATE, TAG_DATE },
+	{ SF_STR_ALBUM, TAG_ALBUM },
+	{ SF_STR_TRACKNUMBER, TAG_TRACK },
+	{ SF_STR_GENRE, TAG_GENRE },
 };
 
 static bool