diff --git a/CHANGES.txt b/CHANGES.txt
index 666dd92d28..e96e1fa4ed 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,8 @@
  * Use JMX to validate nodetool --jobs parameter (CASSANDRA-16104)
  * Handle properly UnsatisfiedLinkError in NativeLibrary#getProcessID() (CASSANDRA-16578)
  * Remove mutation data from error log message (CASSANDRA-16817)
+Merged from 2.2:
+ * Add python2 location to RPMs (CASSANDRA-16822)
 
 
 3.0.25:
diff --git a/redhat/cassandra.spec b/redhat/cassandra.spec
index fade00f102..68f2b4020e 100644
--- a/redhat/cassandra.spec
+++ b/redhat/cassandra.spec
@@ -87,6 +87,9 @@ mkdir -p %{buildroot}/var/lib/%{username}/hints
 mkdir -p %{buildroot}/var/run/%{username}
 mkdir -p %{buildroot}/var/log/%{username}
 ( cd pylib && %{__python} setup.py install --no-compile --root %{buildroot}; )
+# cqlsh before Cassandra version 4.0 still requires python2
+mkdir -p %{buildroot}/usr/lib/python2.7/site-packages
+cp -r %{buildroot}%{python_sitelib}/cqlshlib %{buildroot}/usr/lib/python2.7/site-packages/
 
 # patches for data and log paths
 patch -p1 < debian/patches/001cassandra_yaml_dirs.dpatch
@@ -162,6 +165,8 @@ exit 0
 %attr(755,%{username},%{username}) /var/run/%{username}*
 %{python_sitelib}/cqlshlib/
 %{python_sitelib}/cassandra_pylib*.egg-info
+# cqlsh before Cassandra version 4.0 still requires python2
+/usr/lib/python2.7/site-packages/cqlshlib
 
 %post
 alternatives --install /%{_sysconfdir}/%{username}/conf %{username} /%{_sysconfdir}/%{username}/default.conf/ 0