diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features.adoc
index 3cfee4f05ab..5ef2be1174b 100644
--- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features.adoc
@@ -20,6 +20,8 @@ include::features/logging.adoc[]
 
 include::features/internationalization.adoc[]
 
+include::features/aop.adoc[]
+
 include::features/json.adoc[]
 
 include::features/task-execution-and-scheduling.adoc[]
diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/aop.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/aop.adoc
new file mode 100644
index 00000000000..01dea512bdf
--- /dev/null
+++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/aop.adoc
@@ -0,0 +1,9 @@
+[[features.aop]]
+== Aspect-Oriented Programming
+Spring Boot provides auto-configuration for aspect-oriented programming (AOP).
+You can learn more about AOP with Spring in the {spring-framework-docs}/core.html#aop[Spring Framework reference documentation].
+
+By default, Spring Boot's auto-configuration configures Spring AOP to use CGLib proxies.
+To use JDK proxies instead, set `configprop:spring.aop.proxy-target-class` to `false`.
+
+If AspectJ is on the classpath, Spring Boot's auto-configuration will automatically enable AspectJ auto proxy such that `@EnableAspectJAutoProxy` is not required.