diff --git a/spring-boot-data-geode/src/main/java/org/springframework/boot/data/geode/autoconfigure/GeodeFunctionExecutionAutoConfiguration.java b/spring-boot-data-geode/src/main/java/org/springframework/boot/data/geode/autoconfigure/GeodeFunctionExecutionAutoConfiguration.java
new file mode 100644
index 00000000..9dda6437
--- /dev/null
+++ b/spring-boot-data-geode/src/main/java/org/springframework/boot/data/geode/autoconfigure/GeodeFunctionExecutionAutoConfiguration.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2018 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
+ *
+ *     http://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.boot.data.geode.autoconfigure;
+
+import org.apache.geode.cache.client.ClientCache;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.gemfire.client.ClientCacheFactoryBean;
+import org.springframework.data.gemfire.function.config.EnableGemfireFunctionExecutions;
+
+/**
+ * Spring Boot {@link EnableAutoConfiguration auto-configuration} enabling Apache Geode's Function Execution
+ * functionality in a Spring Boot, Apache Geode {@link ClientCache} application.
+ *
+ * @author John Blum
+ * @see org.apache.geode.cache.client.ClientCache
+ * @see org.springframework.boot.autoconfigure.EnableAutoConfiguration
+ * @see org.springframework.context.annotation.Configuration
+ * @see org.springframework.data.gemfire.client.ClientCacheFactoryBean
+ * @since 1.0.0
+ */
+@Configuration
+@ConditionalOnBean(ClientCache.class)
+@ConditionalOnClass({ ClientCacheFactoryBean.class, ClientCache.class })
+@EnableGemfireFunctionExecutions
+@SuppressWarnings("unused")
+public class GeodeFunctionExecutionAutoConfiguration {
+
+}
diff --git a/spring-boot-data-geode/src/main/resources/META-INF/spring.factories b/spring-boot-data-geode/src/main/resources/META-INF/spring.factories
index 8bd0ad03..5a55b4d3 100644
--- a/spring-boot-data-geode/src/main/resources/META-INF/spring.factories
+++ b/spring-boot-data-geode/src/main/resources/META-INF/spring.factories
@@ -3,4 +3,5 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
 org.springframework.boot.data.geode.autoconfigure.GeodeClientCacheAutoConfiguration,\
 org.springframework.boot.data.geode.autoconfigure.GeodeCachingProviderAutoConfiguration,\
 org.springframework.boot.data.geode.autoconfigure.GeodeContinuousQueryAutoConfiguration,\
+org.springframework.boot.data.geode.autoconfigure.GeodeFunctionExecutionAutoConfiguration,\
 org.springframework.boot.data.geode.autoconfigure.GeodeRepositoriesAutoConfiguration