diff --git a/WHATS_NEW b/WHATS_NEW
index 286d3cb48..abba3bb29 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.01.15 - 
 =================================
+  Reduce chunksize limit to 512k.
   Fix chunksize field in reports.
   Don't hide snapshots from default 'lvs' output.
   Add is_dm_major() for use in duplicate device detection in lvmcache_add().
diff --git a/man/lvcreate.8 b/man/lvcreate.8
index 5cc1695b5..276a46c0d 100644
--- a/man/lvcreate.8
+++ b/man/lvcreate.8
@@ -42,7 +42,7 @@ keep the contents of the original logical volume for backup purposes.
 See \fBlvm\fP for common options.
 .TP
 .I \-c, \-\-chunksize ChunkSize
-Power of 2 chunk size for the snapshot logical volume between 4k and 1024k.
+Power of 2 chunk size for the snapshot logical volume between 4k and 512k.
 .TP
 .I \-C, \-\-contiguous y/n
 Sets or resets the contiguous allocation policy for
diff --git a/tools/lvcreate.c b/tools/lvcreate.c
index aa3440d95..9dde01331 100644
--- a/tools/lvcreate.c
+++ b/tools/lvcreate.c
@@ -303,6 +303,7 @@ static int _read_params(struct lvcreate_params *lp, struct cmd_context *cmd,
 			return 0;
 		}
 		lp->chunk_size = 2 * arg_uint_value(cmd, chunksize_ARG, 8);
+// FIXME Restrict chunk_size to power of 2 in range PAGE_SIZE up to 512k (=1024)
 		log_verbose("Setting chunksize to %d sectors.", lp->chunk_size);
 
 		if (!(lp->segtype = get_segtype_from_string(cmd, "snapshot"))) {