diff --git a/OpenCL/m13400-pure.cl b/OpenCL/m13400-pure.cl
index fc726be84..55ca2856d 100644
--- a/OpenCL/m13400-pure.cl
+++ b/OpenCL/m13400-pure.cl
@@ -38,7 +38,7 @@ typedef struct keepass
 
   /* specific to version 1 */
   u32 contents_len;
-  u32 contents[75000];
+  u32 contents[0x200000];
 
   /* specific to version 2 */
   u32 expected_bytes[8];
diff --git a/docs/changes.txt b/docs/changes.txt
index 7cf7a6248..daecc228c 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -35,6 +35,7 @@
 - Alias Devices: Show a warning in case the user specifically listed a device to use which in a later step is skipped because it is an alias of another active device
 - Backend Information: Added new column showing the PCI Address per CUDA/OpenCL device to easier identify broken cards
 - Debug Rules: HEX-ify rules debug non-rules outputs that contain colons
+- KeePass: Increase supported size for KeePass 1 databases from 300kB to 16MB
 - VeraCrypt: Increase password length support for non-boot volumes from 64 to 128
 
 ##
diff --git a/include/common.h b/include/common.h
index 79377e4f7..445ebc405 100644
--- a/include/common.h
+++ b/include/common.h
@@ -119,7 +119,7 @@ but this is nededed for VS compiler which doesn't have inline keyword but has __
 
 #define HCBUFSIZ_TINY       0x1000
 #define HCBUFSIZ_SMALL      0x2000
-#define HCBUFSIZ_LARGE      0xb0000
+#define HCBUFSIZ_LARGE      0x1000000
 
 #define CPT_CACHE           0x20000
 #define PARAMCNT            64
diff --git a/src/modules/module_13400.c b/src/modules/module_13400.c
index 10260eef1..6fce19d15 100644
--- a/src/modules/module_13400.c
+++ b/src/modules/module_13400.c
@@ -56,7 +56,7 @@ typedef struct keepass
 
   /* specific to version 1 */
   u32 contents_len;
-  u32 contents[75000];
+  u32 contents[0x200000];
 
   /* specific to version 2 */
   u32 expected_bytes[8];
@@ -178,13 +178,13 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
     token.sep[9]     = '*';
     token.len_min[9] = 1;
-    token.len_max[9] = 6;
+    token.len_max[9] = 8;
     token.attr[9]    = TOKEN_ATTR_VERIFY_LENGTH
                      | TOKEN_ATTR_VERIFY_DIGIT;
 
     token.sep[10]     = '*';
     token.len_min[10] = 2;
-    token.len_max[10] = 600000;
+    token.len_max[10] = 0x1000000;
     token.attr[10]    = TOKEN_ATTR_VERIFY_LENGTH
                       | TOKEN_ATTR_VERIFY_HEX;