diff --git a/beetsplug/lastgenre/genres.txt b/beetsplug/lastgenre/genres.txt
index 914ee1290..7ccd7ad3b 100644
--- a/beetsplug/lastgenre/genres.txt
+++ b/beetsplug/lastgenre/genres.txt
@@ -450,6 +450,8 @@ emo rap
 emocore
 emotronic
 enka
+epic doom metal
+epic metal
 eremwu eu
 ethereal pop
 ethereal wave
@@ -1024,6 +1026,7 @@ neo-medieval
 neo-prog
 neo-psychedelia
 neoclassical
+neoclassical metal
 neoclassical music
 neofolk
 neotraditional country
@@ -1176,8 +1179,10 @@ progressive folk
 progressive folk music
 progressive house
 progressive metal
+progressive power metal
 progressive rock
 progressive trance
+progressive thrash metal
 protopunk
 psych folk
 psychedelic music
@@ -1396,6 +1401,7 @@ symphonic metal
 symphonic poem
 symphonic rock
 symphony
+synthcore
 synthpop
 synthpunk
 t'ong guitar
@@ -1428,6 +1434,7 @@ tejano
 tejano music
 tekno
 tembang sunda
+teutonic thrash metal
 texas blues
 thai pop
 thillana
@@ -1444,6 +1451,7 @@ toeshey
 togaku
 trad jazz
 traditional bluegrass
+traditional heavy metal
 traditional pop music
 trallalero
 trance
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 545145f0d..f00380a2c 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,6 +6,7 @@ Changelog
 
 New features:
 
+* :doc:`/plugins/lastgenre`: Added more heavy metal genres: https://en.wikipedia.org/wiki/Heavy_metal_genres to genres.txt and genres-tree.yaml
 * :doc:`/plugins/subsonicplaylist`: import playlist from a subsonic server.
 * A new :ref:`extra_tags` configuration option allows more tagged metadata
   to be included in MusicBrainz queries.