diff --git a/opal/config/opal_configure_options.m4 b/opal/config/opal_configure_options.m4
index 70b72de534..a279ce19be 100644
--- a/opal/config/opal_configure_options.m4
+++ b/opal/config/opal_configure_options.m4
@@ -415,21 +415,6 @@ AC_DEFINE_UNQUOTED([OPAL_ENABLE_FT_CR], [$opal_want_ft_cr],
 AM_CONDITIONAL(WANT_FT, test "$opal_want_ft" = "1")
 AM_CONDITIONAL(WANT_FT_CR,  test "$opal_want_ft_cr" = "1")
 
-#
-# Compile in resilient runtime code
-#
-AC_ARG_ENABLE(resilient-orte,
-    [AC_HELP_STRING([--enable-resilient-orte], [Enable the resilient runtime code.])])
-AS_IF( [test "$enable_resilient_orte" = "yes"], [result=1], [result=0] )
-
-AM_CONDITIONAL(ORTE_RESIL_ORTE, [test "$enable_resilient_orte" = "yes"])
-AC_DEFINE_UNQUOTED([ORTE_RESIL_ORTE], [$result],
-     [Compile a resilient version of Open MPI])
-
-AM_CONDITIONAL(ORTE_ENABLE_EPOCH, [test "$enable_resilient_orte" = "yes"])
-AC_DEFINE_UNQUOTED([ORTE_ENABLE_EPOCH], [$result],
-     [Support for epoch in the ORTE process name enabled or not])
-
 #
 # Do we want to install binaries?
 #
diff --git a/orte/config/orte_configure_options.m4 b/orte/config/orte_configure_options.m4
index d46cc5ebcd..492bfb27d7 100644
--- a/orte/config/orte_configure_options.m4
+++ b/orte/config/orte_configure_options.m4
@@ -132,4 +132,20 @@ AC_DEFINE_UNQUOTED([ORTE_ENABLE_HEARTBEAT],
                    [$orte_want_heartbeats],
                    [Whether we want daemon heartbeat monitoring enabled])
 
+#
+# Compile in resilient runtime code
+#
+AC_ARG_ENABLE(resilient-orte,
+    [AC_HELP_STRING([--enable-resilient-orte], [Enable the resilient runtime code.])])
+AS_IF( [test "$enable_resilient_orte" = "yes"], [result=1], [result=0] )
+
+AM_CONDITIONAL(ORTE_RESIL_ORTE, [test "$enable_resilient_orte" = "yes"])
+AC_DEFINE_UNQUOTED([ORTE_RESIL_ORTE], [$result],
+     [Compile a resilient version of Open MPI])
+
+AM_CONDITIONAL(ORTE_ENABLE_EPOCH, [test "$enable_resilient_orte" = "yes"])
+AC_DEFINE_UNQUOTED([ORTE_ENABLE_EPOCH], [$result],
+     [Support for epoch in the ORTE process name enabled or not])
+
+
 ])dnl