diff --git a/beetsplug/lastgenre/genres-tree.yaml b/beetsplug/lastgenre/genres-tree.yaml
index c1b1a081b..a09f7e6b3 100644
--- a/beetsplug/lastgenre/genres-tree.yaml
+++ b/beetsplug/lastgenre/genres-tree.yaml
@@ -133,7 +133,6 @@
     - chutney
     - chutney soca
     - compas
-    - dance hall
     - mambo
     - merengue
     - méringue
@@ -148,7 +147,6 @@
     - punta
     - punta rock
     - rasin
-    - reggae
     - reggaeton
     - salsa
     - soca
@@ -291,7 +289,7 @@
         - neurofunk
         - oldschool jungle:
             - darkside jungle
-            - ragga-jungle
+            - ragga jungle
         - raggacore
         - sambass
         - techstep
@@ -505,12 +503,10 @@
     - new school hip hop
     - old school hip hop
     - political hip hop
-    - ragga
     - rap opera
     - rap rock:
         - rap metal
         - rapcore
-    - reggae español/spanish reggae
     - songo-salsa
     - southern hip hop:
         - atlanta hip hop:
@@ -735,12 +731,19 @@
     - surf rock
     - visual kei:
         - nagoya kei
-- ska:
-    - 2 tone
-    - dancehall
-    - dub
-    - lovers rock
-    - ragga jungle
-        - polish reggae
+- reggae:
+    - roots reggae
     - reggae fusion
-    - rocksteady
+    - reggae en español:
+        - spanish reggae
+        - reggae 110
+        - reggae bultrón
+        - romantic flow
+    - lovers rock
+    - raggamuffin:
+        - ragga
+    - dancehall
+    - ska:
+        - 2 tone
+        - dub
+        - rocksteady
diff --git a/beetsplug/lastgenre/genres.txt b/beetsplug/lastgenre/genres.txt
index 64e583bfa..914ee1290 100644
--- a/beetsplug/lastgenre/genres.txt
+++ b/beetsplug/lastgenre/genres.txt
@@ -1224,6 +1224,9 @@ rebetiko
 red dirt
 reel
 reggae
+reggae 110
+reggae bultrón
+reggae en español
 reggae fusion
 reggae highlife
 reggaefusion
@@ -1247,6 +1250,7 @@ rock opera
 rockabilly
 rocksteady
 rococo
+romantic flow
 romantic period in music
 rondeaux
 ronggeng
diff --git a/docs/changelog.rst b/docs/changelog.rst
index c247aa429..4eafe9c90 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -14,6 +14,8 @@ Fixes:
   and name in quick succession. The importer would fail to detect them as
   duplicates, claiming that there were "empty albums" in the database even
   when there were not. :bug:`1652`
+* :doc:`plugins/lastgenre`: Clean up the reggae related genres somewhat.
+  Thanks to :user:`Freso`. :bug:`1661`
 
 
 1.3.15 (October 17, 2015)