diff --git a/spring-jms/src/main/java/org/springframework/jms/config/AbstractJmsListenerContainerFactory.java b/spring-jms/src/main/java/org/springframework/jms/config/AbstractJmsListenerContainerFactory.java
index cfaf8de1c1..811709cd53 100644
--- a/spring-jms/src/main/java/org/springframework/jms/config/AbstractJmsListenerContainerFactory.java
+++ b/spring-jms/src/main/java/org/springframework/jms/config/AbstractJmsListenerContainerFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,6 +60,8 @@ public abstract class AbstractJmsListenerContainerFactory<C extends AbstractMess
 
 	private Integer phase;
 
+	private Boolean autoStartup;
+
 
 	/**
 	 * @see AbstractMessageListenerContainer#setConnectionFactory(ConnectionFactory)
@@ -138,6 +140,12 @@ public abstract class AbstractJmsListenerContainerFactory<C extends AbstractMess
 		this.phase = phase;
 	}
 
+	/**
+	 * @see AbstractMessageListenerContainer#setAutoStartup(boolean)
+	 */
+	public void setAutoStartup(boolean autoStartup) {
+		this.autoStartup = autoStartup;
+	}
 
 	@Override
 	public C createListenerContainer(JmsListenerEndpoint endpoint) {
@@ -176,6 +184,9 @@ public abstract class AbstractJmsListenerContainerFactory<C extends AbstractMess
 		if (this.phase != null) {
 			instance.setPhase(this.phase);
 		}
+		if (this.autoStartup != null) {
+			instance.setAutoStartup(this.autoStartup);
+		}
 
 		endpoint.setupListenerContainer(instance);
 		initializeContainer(instance);
diff --git a/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryTests.java b/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryTests.java
index fe570a0368..81afa3b2c7 100644
--- a/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryTests.java
@@ -157,6 +157,7 @@ public class JmsListenerContainerFactoryTests {
 		factory.setPubSubDomain(true);
 		factory.setSubscriptionDurable(true);
 		factory.setClientId("client-1234");
+		factory.setAutoStartup(false);
 	}
 
 	private void assertDefaultJmsConfig(AbstractMessageListenerContainer container) {
@@ -168,6 +169,7 @@ public class JmsListenerContainerFactoryTests {
 		assertEquals(true, container.isPubSubDomain());
 		assertEquals(true, container.isSubscriptionDurable());
 		assertEquals("client-1234", container.getClientId());
+		assertEquals(false, container.isAutoStartup());
 	}
 
 	private void setDefaultJcaConfig(DefaultJcaListenerContainerFactory factory) {