diff --git a/CHANGES.txt b/CHANGES.txt
index 631c7741d7..14dca808e1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -51,6 +51,7 @@
  * skip reading saved key cache if CF's caching strategy is NONE or ROWS_ONLY (CASSANDRA-3954)
  * Unify migration code (CASSANDRA-4017)
 Merged from 1.0:
+ * cqlsh: guess correct version of Python for Arch Linux (CASSANDRA-4090)
  * improve index sampling performance (CASSANDRA-4023)
  * always compact away deleted hints immediately after handoff (CASSANDRA-3955)
  * delete hints from dropped ColumnFamilies on handoff instead of
diff --git a/bin/cqlsh b/bin/cqlsh
index 118fbac24d..69059d06cb 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -20,7 +20,7 @@
 """:"
 # bash code here; finds a suitable python interpreter and execs this file.
 # prefer unqualified "python" if suitable:
-python -c 'import sys; sys.exit(sys.hexversion < 0x020500b0)' 2>/dev/null \
+python -c 'import sys; sys.exit(not (0x020500b0 < sys.hexversion < 0x03000000))' 2>/dev/null \
     && exec python "$0" "$@"
 for pyver in 2.6 2.7 2.5; do
     which python$pyver > /dev/null 2>&1 && exec python$pyver "$0" "$@"