diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml
index 6610ca516..27373959e 100644
--- a/spring-cloud-function-rsocket/pom.xml
+++ b/spring-cloud-function-rsocket/pom.xml
@@ -37,6 +37,12 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-function-context</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>io.rsocket.routing</groupId>
+			<artifactId>rsocket-routing-client-spring</artifactId>
+			<version>${rsocket-routing.version}</version>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-configuration-processor</artifactId>
@@ -52,12 +58,6 @@
 		    <artifactId>reactor-test</artifactId>
 		    <scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>io.rsocket.routing</groupId>
-			<artifactId>rsocket-routing-client-spring</artifactId>
-			<version>${rsocket-routing.version}</version>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>io.rsocket.routing</groupId>
 			<artifactId>rsocket-routing-broker-spring</artifactId>
diff --git a/spring-cloud-function-rsocket/src/main/java/org/springframework/cloud/function/rsocket/RSocketAutoConfiguration.java b/spring-cloud-function-rsocket/src/main/java/org/springframework/cloud/function/rsocket/RSocketAutoConfiguration.java
index 8d2ac2d0e..fb3572ec5 100644
--- a/spring-cloud-function-rsocket/src/main/java/org/springframework/cloud/function/rsocket/RSocketAutoConfiguration.java
+++ b/spring-cloud-function-rsocket/src/main/java/org/springframework/cloud/function/rsocket/RSocketAutoConfiguration.java
@@ -19,14 +19,11 @@ package org.springframework.cloud.function.rsocket;
 import java.net.InetSocketAddress;
 
 import io.rsocket.RSocket;
-import io.rsocket.SocketAcceptor;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.function.context.FunctionCatalog;
@@ -41,7 +38,6 @@ import org.springframework.context.SmartLifecycle;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.support.GenericApplicationContext;
-import org.springframework.messaging.rsocket.RSocketConnectorConfigurer;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -55,7 +51,6 @@ import org.springframework.util.StringUtils;
 @Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties({ FunctionProperties.class, RSocketFunctionProperties.class })
 @ConditionalOnProperty(name = FunctionProperties.PREFIX + ".rsocket.enabled", matchIfMissing = true)
-@AutoConfigureBefore(name = "io.rsocket.routing.client.spring.RoutingClientAutoConfiguration")
 public class RSocketAutoConfiguration {
 
 	private static Log logger = LogFactory.getLog(RSocketAutoConfiguration.class);
@@ -66,18 +61,10 @@ public class RSocketAutoConfiguration {
 		return new FunctionToRSocketBinder(functionCatalog, functionProperties, rSocketFunctionProperties);
 	}
 
-	@Bean
-	@ConditionalOnClass(name = "io.rsocket.routing.client.spring.RoutingClientAutoConfiguration")
-	//TODO: move to broker specific auto config
-	public RSocketConnectorConfigurer functionRSocketConnectorConfigurer(
-			FunctionToRSocketBinder binder) {
-		return connector -> connector.acceptor(SocketAcceptor.with(binder.getRSocket()));
-	}
-
 	/**
 	 *
 	 */
-	private static class FunctionToRSocketBinder implements InitializingBean, ApplicationContextAware, SmartLifecycle {
+	static class FunctionToRSocketBinder implements InitializingBean, ApplicationContextAware, SmartLifecycle {
 
 		private final FunctionCatalog functionCatalog;
 
diff --git a/spring-cloud-function-rsocket/src/main/java/org/springframework/cloud/function/rsocket/RSocketRoutingAutoConfiguration.java b/spring-cloud-function-rsocket/src/main/java/org/springframework/cloud/function/rsocket/RSocketRoutingAutoConfiguration.java
new file mode 100644
index 000000000..cf7fc5dc5
--- /dev/null
+++ b/spring-cloud-function-rsocket/src/main/java/org/springframework/cloud/function/rsocket/RSocketRoutingAutoConfiguration.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2020-2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.function.rsocket;
+
+import io.rsocket.SocketAcceptor;
+import io.rsocket.routing.client.spring.RoutingClientAutoConfiguration;
+
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.cloud.function.context.FunctionProperties;
+import org.springframework.cloud.function.rsocket.RSocketAutoConfiguration.FunctionToRSocketBinder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.messaging.rsocket.RSocketConnectorConfigurer;
+
+/**
+ * Configuration for components required to support RSocket Routing Client
+ * integration with spring-cloud-function.
+ *
+ * @author Spencer Gibb
+ * @since 3.1
+ */
+@Configuration(proxyBeanMethods = false)
+@ConditionalOnClass(RoutingClientAutoConfiguration.class)
+@ConditionalOnProperty(name = FunctionProperties.PREFIX + ".rsocket.enabled", matchIfMissing = true)
+@AutoConfigureBefore(RoutingClientAutoConfiguration.class)
+@AutoConfigureAfter(RSocketAutoConfiguration.class)
+public class RSocketRoutingAutoConfiguration {
+
+	@Bean
+	public RSocketConnectorConfigurer functionRSocketConnectorConfigurer(
+			FunctionToRSocketBinder binder) {
+		return connector -> connector.acceptor(SocketAcceptor.with(binder.getRSocket()));
+	}
+
+}
diff --git a/spring-cloud-function-rsocket/src/main/resources/META-INF/spring.factories b/spring-cloud-function-rsocket/src/main/resources/META-INF/spring.factories
index a1476973a..1bbff0f99 100644
--- a/spring-cloud-function-rsocket/src/main/resources/META-INF/spring.factories
+++ b/spring-cloud-function-rsocket/src/main/resources/META-INF/spring.factories
@@ -1 +1,3 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=org.springframework.cloud.function.rsocket.RSocketAutoConfiguration
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+org.springframework.cloud.function.rsocket.RSocketAutoConfiguration,\
+org.springframework.cloud.function.rsocket.RSocketRoutingAutoConfiguration