diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java
index 72a26206f2c4..63d58ffb24dd 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java
@@ -194,6 +194,7 @@ private void runScripts(List<Resource> resources, String username, String passwo
 		ResourceDatabasePopulator populator = new ResourceDatabasePopulator();
 		populator.setContinueOnError(this.properties.isContinueOnError());
 		populator.setSeparator(this.properties.getSeparator());
+		populator.setCommentPrefix(this.properties.getCommentPrefix());
 		if (this.properties.getSqlScriptEncoding() != null) {
 			populator.setSqlScriptEncoding(this.properties.getSqlScriptEncoding().name());
 		}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java
index 27767dfe8c88..f9db93fab397 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java
@@ -24,6 +24,7 @@
 
 import javax.sql.DataSource;
 
+import org.springframework.jdbc.datasource.init.ScriptUtils;
 import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.InitializingBean;
@@ -143,6 +144,11 @@ public class DataSourceProperties implements BeanClassLoaderAware, InitializingB
 	 * Statement separator in SQL initialization scripts.
 	 */
 	private String separator = ";";
+	
+	/**
+	 * Prefix that identifies single-line comments within the SQL scripts.
+	 */
+	private String commentPrefix = ScriptUtils.DEFAULT_COMMENT_PREFIX;
 
 	/**
 	 * SQL scripts encoding.
@@ -457,6 +463,14 @@ public String getSeparator() {
 	public void setSeparator(String separator) {
 		this.separator = separator;
 	}
+	
+	public String getCommentPrefix() {
+		return this.commentPrefix;
+	}
+	
+	public void setCommentPrefix(String commentPrefix) {
+		this.commentPrefix = commentPrefix;
+	}
 
 	public Charset getSqlScriptEncoding() {
 		return this.sqlScriptEncoding;