diff --git a/documentation/src/main/asciidoc/userguide/chapters/jdbc/Database_Access.adoc b/documentation/src/main/asciidoc/userguide/chapters/jdbc/Database_Access.adoc
index bb23921aa8..c321d4ae07 100644
--- a/documentation/src/main/asciidoc/userguide/chapters/jdbc/Database_Access.adoc
+++ b/documentation/src/main/asciidoc/userguide/chapters/jdbc/Database_Access.adoc
@@ -277,8 +277,9 @@ If for some reason it is not able to determine the proper one or you want to use
 |Firebird |Support for the Firebird database
 |FrontBase |Support for the Frontbase database
 |H2 |Support for the H2 database
-|HANAColumnStore |Support for the SAP HANA database column store. This is the recommended dialect for the SAP HANA database.
-|HANARowStore |Support for the SAP HANA database row store
+|HANACloudColumnStore |Support for the SAP HANA Cloud database column store.
+|HANAColumnStore |Support for the SAP HANA database column store, version 2.x. This is the recommended dialect for the SAP HANA database. May work with SAP HANA, version 1.x
+|HANARowStore |Support for the SAP HANA database row store, version 2.x. May work with SAP HANA, version 1.x
 |HSQL |Support for the HSQL (HyperSQL) database
 |Informix |Support for the Informix database
 |Ingres |Support for the Ingres database, version 9.2
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/DefaultDialectSelector.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/DefaultDialectSelector.java
index 23fe829016..574acfcc03 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/DefaultDialectSelector.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/DefaultDialectSelector.java
@@ -22,6 +22,7 @@ import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.FirebirdDialect;
 import org.hibernate.dialect.FrontBaseDialect;
 import org.hibernate.dialect.H2Dialect;
+import org.hibernate.dialect.HANACloudColumnStoreDialect;
 import org.hibernate.dialect.HANAColumnStoreDialect;
 import org.hibernate.dialect.HANARowStoreDialect;
 import org.hibernate.dialect.HSQLDialect;
@@ -136,6 +137,9 @@ public class DefaultDialectSelector implements LazyServiceResolver<Dialect> {
 		if ( name.equals( "H2" ) ) {
 			return H2Dialect.class;
 		}
+		if ( name.equals( "HANACloudColumnStore" ) ) {
+			return HANACloudColumnStoreDialect.class;
+		}
 		if ( name.equals( "HANAColumnStore" ) ) {
 			return HANAColumnStoreDialect.class;
 		}