diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java
index a02e2e09f0..2b2ab70744 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java
@@ -27,6 +27,7 @@ import javax.sql.DataSource;
 import org.flywaydb.core.Flyway;
 import org.flywaydb.core.api.MigrationVersion;
 import org.flywaydb.core.api.callback.FlywayCallback;
+import org.flywaydb.core.internal.callback.SqlScriptFlywayCallback;
 import org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform;
 import org.junit.After;
 import org.junit.Before;
@@ -265,7 +266,9 @@ public class FlywayAutoConfigurationTests {
 				FlywayCallback.class);
 		FlywayCallback callbackTwo = this.context.getBean("callbackTwo",
 				FlywayCallback.class);
-		assertThat(flyway.getCallbacks()).containsExactly(callbackTwo, callbackOne);
+		assertThat(flyway.getCallbacks()).hasSize(3);
+		assertThat(flyway.getCallbacks()).startsWith(callbackTwo, callbackOne);
+		assertThat(flyway.getCallbacks()[2]).isInstanceOf(SqlScriptFlywayCallback.class);
 		InOrder orderedCallbacks = inOrder(callbackOne, callbackTwo);
 		orderedCallbacks.verify(callbackTwo).beforeMigrate(any(Connection.class));
 		orderedCallbacks.verify(callbackOne).beforeMigrate(any(Connection.class));
diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 3f52809706..73057a7a52 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -75,7 +75,7 @@
 		<ehcache3.version>3.2.1</ehcache3.version>
 		<embedded-mongo.version>1.50.5</embedded-mongo.version>
 		<fast-classpath-scanner.version>2.0.17</fast-classpath-scanner.version>
-		<flyway.version>4.0.3</flyway.version>
+		<flyway.version>4.1.2</flyway.version>
 		<freemarker.version>2.3.25-incubating</freemarker.version>
 		<elasticsearch.version>2.4.4</elasticsearch.version>
 		<glassfish-el.version>3.0.0</glassfish-el.version>
diff --git a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
index 5a03283504..6c9d8b673f 100644
--- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
+++ b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
@@ -489,15 +489,20 @@ content into your application; rather pick only the properties that you need.
 	# ----------------------------------------
 
 	# FLYWAY ({sc-spring-boot-autoconfigure}/flyway/FlywayProperties.{sc-ext}[FlywayProperties])
+	flyway.allow-mixed-migrations= #
 	flyway.baseline-description= #
-	flyway.baseline-version=1 # version to start migration
 	flyway.baseline-on-migrate= #
+	flyway.baseline-version=1 # version to start migration
 	flyway.check-location=false # Check that migration scripts location exists.
+	flyway.clean-disabled= #
 	flyway.clean-on-validation-error= #
 	flyway.enabled=true # Enable flyway.
 	flyway.encoding= #
 	flyway.ignore-failed-future-migration= #
+	flyway.ignore-future-migrations= #
+	flyway.ignore-missing-migrations= #
 	flyway.init-sqls= # SQL statements to execute to initialize a connection immediately after obtaining it.
+	flyway.installed-by= #
 	flyway.locations=classpath:db/migration # locations of migrations scripts
 	flyway.out-of-order= #
 	flyway.password= # JDBC password if you want Flyway to create its own DataSource
@@ -505,11 +510,15 @@ content into your application; rather pick only the properties that you need.
 	flyway.placeholder-replacement= #
 	flyway.placeholder-suffix= #
 	flyway.placeholders.*= #
+	flyway.repeatable-sql-migration-prefix= #
 	flyway.schemas= # schemas to update
+	flyway.skip-default-callbacks= #
+	flyway.skip-default-resolvers= #
 	flyway.sql-migration-prefix=V #
 	flyway.sql-migration-separator= #
 	flyway.sql-migration-suffix=.sql #
 	flyway.table= #
+	flyway.target= #
 	flyway.url= # JDBC url of the database to migrate. If not set, the primary configured data source is used.
 	flyway.user= # Login user of the database to migrate.
 	flyway.validate-on-migrate= #