diff --git a/apps/metadata.h b/apps/metadata.h
index b268a3d474..3499e13f47 100644
--- a/apps/metadata.h
+++ b/apps/metadata.h
@@ -176,10 +176,10 @@ extern const struct afmt_entry audio_formats[AFMT_NUM_CODECS];
 
 #if MEMORYSIZE > 2
 #define ID3V2_BUF_SIZE 900
-#define ID3V2_MAX_ITEM_SIZE 120
+#define ID3V2_MAX_ITEM_SIZE 240
 #else
 #define ID3V2_BUF_SIZE 300
-#define ID3V2_MAX_ITEM_SIZE 60
+#define ID3V2_MAX_ITEM_SIZE 90
 #endif
 
 enum {
diff --git a/docs/CREDITS b/docs/CREDITS
index a7f9a37676..c1a611e84c 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -593,6 +593,7 @@ Leif Andersen
 Sergiu Rotaru
 Noé Lojkine
 Ophir Lojkine
+Stephan Grossklass
 
 The libmad team
 The wavpack team