diff --git a/CHANGES.txt b/CHANGES.txt
index 051e20a9b7..77b9a92b1a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -238,6 +238,7 @@
 
 
 3.11.3
+ * Detect OpenJDK jvm type and architecture (CASSANDRA-12793)
  * Don't use guava collections in the non-system keyspace jmx attributes (CASSANDRA-12271)
  * Allow existing nodes to use all peers in shadow round (CASSANDRA-13851)
  * Fix cqlsh to read connection.ssl cqlshrc option again (CASSANDRA-14299)
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index e7cf2cd3e3..3ccb1e16af 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -102,7 +102,7 @@ if [ "$JVM_VERSION" \< "1.8" ] && [ "$JVM_PATCH_VERSION" -lt 40 ] ; then
     exit 1;
 fi
 
-jvm=`echo "$java_ver_output" | grep -A 1 'java version' | awk 'NR==2 {print $1}'`
+jvm=`echo "$java_ver_output" | grep -A 1 '[openjdk|java] version' | awk 'NR==2 {print $1}'`
 case "$jvm" in
     OpenJDK)
         JVM_VENDOR=OpenJDK