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 556bf7ad5..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
@@ -1,10 +1,10 @@
 package picocli.spring.boot.autoconfigure;
 
-import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 import picocli.CommandLine;
 import picocli.CommandLine.IFactory;
@@ -13,7 +13,7 @@
 /**
  * @author Thibaud Leprêtre
  */
-@AutoConfiguration
+@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
new file mode 100644
index 000000000..f47a155de
--- /dev/null
+++ b/picocli-spring-boot-starter/src/main/resources/META-INF/spring.factories
@@ -0,0 +1 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=picocli.spring.boot.autoconfigure.PicocliAutoConfiguration