diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DriverClassNameProvider.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DriverClassNameProvider.java
index b978429bd1..540b6d32be 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DriverClassNameProvider.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DriverClassNameProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2015 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.
@@ -46,6 +46,9 @@ class DriverClassNameProvider {
 		drivers.put("postgresql", "org.postgresql.Driver");
 		drivers.put("jtds", "net.sourceforge.jtds.jdbc.Driver");
 		drivers.put("sqlserver", "com.microsoft.sqlserver.jdbc.SQLServerDriver");
+		drivers.put("firebirdsql", "org.firebirdsql.jdbc.FBDriver");
+		drivers.put("db2", "com.ibm.db2.jcc.DB2Driver");
+		drivers.put("teradata", "com.teradata.jdbc.TeraDriver");
 		DRIVERS = Collections.unmodifiableMap(drivers);
 	}
 
diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 31c878d1fc..e5f1c8d900 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -90,6 +90,7 @@
 		<javax-mail.version>1.5.3</javax-mail.version>
 		<javax-transaction.version>1.2</javax-transaction.version>
 		<jaxen.version>1.1.6</jaxen.version>
+		<jaybird.version>2.2.8</jaybird.version>
 		<jdom2.version>2.0.6</jdom2.version>
 		<jedis.version>2.7.2</jedis.version>
 		<jersey.version>2.18</jersey.version>
@@ -1318,6 +1319,21 @@
 				<artifactId>elasticsearch</artifactId>
 				<version>${elasticsearch.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.firebirdsql.jdbc</groupId>
+				<artifactId>jaybird-jdk16</artifactId>
+				<version>${jaybird.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.firebirdsql.jdbc</groupId>
+				<artifactId>jaybird-jdk17</artifactId>
+				<version>${jaybird.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.firebirdsql.jdbc</groupId>
+				<artifactId>jaybird-jdk18</artifactId>
+				<version>${jaybird.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.flywaydb</groupId>
 				<artifactId>flyway-core</artifactId>