diff --git a/docs/changes.txt b/docs/changes.txt
index 786338db9..d1e9698cf 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -29,6 +29,7 @@
 - Added a tracker for salts, amplifier and iterations to the status screen
 - Added option --markov-hcstat2 to make it clear that the new hcstat2 format (compressed hcstat2gen output) must be used
 - Allow bitcoin master key lengths other than 96 bytes (but they must be always multiples of 16)
+- Allow keepass iteration count to be larger than 999999
 - Allow hashfile for -m 16800 to be used with -m 16801
 - Do not allocate memory segments for bitmap tables if we don't need it - for example, in benchmark mode
 - Got rid of OPTS_TYPE_HASH_COPY for Ansible Vault
diff --git a/src/interface.c b/src/interface.c
index 71fc62008..4d75c16a1 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -14283,7 +14283,7 @@ int keepass_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UN
 
   token.sep[2]     = '*';
   token.len_min[2] = 1;
-  token.len_max[2] = 6;
+  token.len_max[2] = 8;
   token.attr[2]    = TOKEN_ATTR_VERIFY_LENGTH
                    | TOKEN_ATTR_VERIFY_DIGIT;