diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DatabaseLookup.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DatabaseLookup.java
index 1347779224..2be5115886 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DatabaseLookup.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DatabaseLookup.java
@@ -53,6 +53,7 @@ final class DatabaseLookup {
 		map.put(DatabaseDriver.SQLSERVER, Database.SQL_SERVER);
 		map.put(DatabaseDriver.DB2, Database.DB2);
 		map.put(DatabaseDriver.INFORMIX, Database.INFORMIX);
+		map.put(DatabaseDriver.HANA, Database.HANA);
 		LOOKUP = Collections.unmodifiableMap(map);
 	}
 
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/DatabaseLookupTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/DatabaseLookupTests.java
index 4d334a0a8a..82823ecb96 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/DatabaseLookupTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/DatabaseLookupTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -92,6 +92,11 @@ public class DatabaseLookupTests {
 		testGetDatabase("jdbc:informix-sqli:", Database.INFORMIX);
 	}
 
+	@Test
+	public void getDatabaseWhenSapShouldReturnHana() throws Exception {
+		testGetDatabase("jdbc:sap:", Database.HANA);
+	}
+
 	private void testGetDatabase(String url, Database expected) throws Exception {
 		DataSource dataSource = mock(DataSource.class);
 		Connection connection = mock(Connection.class);