diff --git a/picocli-spring-boot-starter/src/main/java/picocli/spring/boot/autoconfigure/PicocliAutoConfiguration.java b/picocli-spring-boot-starter/src/main/java/picocli/spring/boot/autoconfigure/PicocliAutoConfiguration.java
index aa60f7335..49e03f5b3 100644
--- a/picocli-spring-boot-starter/src/main/java/picocli/spring/boot/autoconfigure/PicocliAutoConfiguration.java
+++ b/picocli-spring-boot-starter/src/main/java/picocli/spring/boot/autoconfigure/PicocliAutoConfiguration.java
@@ -13,7 +13,7 @@
 /**
  * @author Thibaud Leprêtre
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(CommandLine.class)
 public class PicocliAutoConfiguration {
 
diff --git a/picocli-spring-boot-starter/src/main/resources/META-INF/spring.factories b/picocli-spring-boot-starter/src/main/resources/META-INF/spring.factories
index 4bbb19396..f47a155de 100644
--- a/picocli-spring-boot-starter/src/main/resources/META-INF/spring.factories
+++ b/picocli-spring-boot-starter/src/main/resources/META-INF/spring.factories
@@ -1 +1 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=picocli.spring.boot.autoconfigure.PicocliAutoConfiguration
\ No newline at end of file
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=picocli.spring.boot.autoconfigure.PicocliAutoConfiguration
diff --git a/picocli-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/picocli-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 000000000..49f708bf9
--- /dev/null
+++ b/picocli-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+picocli.spring.boot.autoconfigure.PicocliAutoConfiguration