diff --git a/CHANGES.txt b/CHANGES.txt
index 3430527627..1c632687ab 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,7 @@
  * Restore sasi dependencies jflex, snowball-stemmer, and concurrent-trees, in the cassandra-all pom (CASSANDRA-16303)
  * Fix DecimalDeserializer#toString OOM (CASSANDRA-14925)
 Merged from 3.11:
+ * Update jflex-1.6.0.jar to match upstream (CASSANDRA-16393)
 Merged from 3.0:
  * Prevent unbounded number of pending flushing tasks (CASSANDRA-16261)
  * Improve empty hint file handling during startup (CASSANDRA-16162)
diff --git a/lib/jflex-1.6.0.jar b/lib/jflex-1.6.0.jar
index 550e446cdd..b22895c654 100644
Binary files a/lib/jflex-1.6.0.jar and b/lib/jflex-1.6.0.jar differ