diff --git a/taglib/mpeg/id3v1/id3v1genres.cpp b/taglib/mpeg/id3v1/id3v1genres.cpp
index eba4c526..074c8bff 100644
--- a/taglib/mpeg/id3v1/id3v1genres.cpp
+++ b/taglib/mpeg/id3v1/id3v1genres.cpp
@@ -30,7 +30,7 @@ using namespace TagLib;
 namespace TagLib {
   namespace ID3v1 {
 
-    static const int genresSize = 148;
+    static const int genresSize = 192;
     static const String genres[] = {
       "Blues",
       "Classic Rock",
@@ -179,7 +179,51 @@ namespace TagLib {
       "Thrash Metal",
       "Anime",
       "Jpop",
-      "Synthpop"
+      "Synthpop",
+      "Abstract",
+      "Art Rock",
+      "Baroque",
+      "Bhangra",
+      "Big Beat",
+      "Breakbeat",
+      "Chillout",
+      "Downtempo",
+      "Dub",
+      "EBM",
+      "Eclectic",
+      "Electro",
+      "Electroclash",
+      "Emo",
+      "Experimental",
+      "Garage",
+      "Global",
+      "IDM",
+      "Illbient",
+      "Industro-Goth",
+      "Jam Band",
+      "Krautrock",
+      "Leftfield",
+      "Lounge",
+      "Math Rock",
+      "New Romantic",
+      "Nu-Breakz",
+      "Post-Punk",
+      "Post-Rock",
+      "Psytrance",
+      "Shoegaze",
+      "Space Rock",
+      "Trop Rock",
+      "World Music",
+      "Neoclassical",
+      "Audiobook",
+      "Audio Theatre",
+      "Neue Deutsche Welle",
+      "Podcast",
+      "Indie Rock",
+      "G-Funk",
+      "Dubstep",
+      "Garage Rock",
+      "Psybient"
     };
   }
 }
diff --git a/taglib/mpeg/id3v1/id3v1genres.h b/taglib/mpeg/id3v1/id3v1genres.h
index 271f7259..0a0dd970 100644
--- a/taglib/mpeg/id3v1/id3v1genres.h
+++ b/taglib/mpeg/id3v1/id3v1genres.h
@@ -49,7 +49,7 @@ namespace TagLib {
 
     /*!
      * Returns the name of the genre at \a index in the ID3v1 genre list.  If
-     * \a index is out of range -- less than zero or greater than 146 -- a null
+     * \a index is out of range -- less than zero or greater than 191 -- a null
      * string will be returned.
      */
     String TAGLIB_EXPORT genre(int index);