diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java
index 24a436000f..297f0b5bb2 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java
@@ -90,6 +90,9 @@ public class JacksonAutoConfiguration {
 				objectMapper.configure(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS,
 						true);
 			}
+			if (this.properties.isJsonPrettyPrint()) {
+				objectMapper.configure(SerializationFeature.INDENT_OUTPUT, true);
+			}
 			return objectMapper;
 		}