diff --git a/config/ompi_check_ucx.m4 b/config/ompi_check_ucx.m4
index 1bce5179f8..a8a3f597cc 100644
--- a/config/ompi_check_ucx.m4
+++ b/config/ompi_check_ucx.m4
@@ -45,7 +45,7 @@ AC_DEFUN([OMPI_CHECK_UCX],[
                         [OPAL_CHECK_PACKAGE([ompi_check_ucx],
                                    [ucp/api/ucp.h],
                                    [ucp],
-                                   [ucp_cleanup],
+                                   [ucp_ep_flush_nb],
                                    [],
                                    [],
                                    [],
@@ -77,7 +77,7 @@ AC_DEFUN([OMPI_CHECK_UCX],[
                          OPAL_CHECK_PACKAGE([ompi_check_ucx],
                                             [ucp/api/ucp.h],
                                             [ucp],
-                                            [ucp_cleanup],
+                                            [ucp_ep_flush_nb],
                                             [],
                                             [$ompi_check_ucx_dir],
                                             [$ompi_check_ucx_libdir],
diff --git a/opal/mca/common/ucx/Makefile.am b/opal/mca/common/ucx/Makefile.am
index 1f24f3e8b0..d225dabf76 100644
--- a/opal/mca/common/ucx/Makefile.am
+++ b/opal/mca/common/ucx/Makefile.am
@@ -50,6 +50,10 @@ endif
 
 lib@OPAL_LIB_PREFIX@mca_common_ucx_la_SOURCES = \
         $(headers) $(sources)
+lib@OPAL_LIB_PREFIX@mca_common_ucx_la_CFLAGS = \
+		$(common_ucx_CFLAGS)
+lib@OPAL_LIB_PREFIX@mca_common_ucx_la_CPPFLAGS = \
+		$(common_ucx_CPPFLAGS)
 lib@OPAL_LIB_PREFIX@mca_common_ucx_la_LDFLAGS = \
         -version-info $(libmca_opal_common_ucx_so_version) \
 		$(common_ucx_LDFLAGS)
@@ -58,6 +62,10 @@ lib@OPAL_LIB_PREFIX@mca_common_ucx_la_LIBADD = \
 		$(OMPI_TOP_BUILDDIR)/opal/lib@OPAL_LIB_PREFIX@open-pal.la
 lib@OPAL_LIB_PREFIX@mca_common_ucx_noinst_la_SOURCES = \
         $(headers) $(sources)
+lib@OPAL_LIB_PREFIX@mca_common_ucx_noinst_la_CFLAGS = \
+		$(common_ucx_CFLAGS)
+lib@OPAL_LIB_PREFIX@mca_common_ucx_noinst_la_CPPFLAGS = \
+		$(common_ucx_CPPFLAGS)
 lib@OPAL_LIB_PREFIX@mca_common_ucx_noinst_la_LDFLAGS = \
 		$(common_ucx_LDFLAGS)
 lib@OPAL_LIB_PREFIX@mca_common_ucx_noinst_la_LIBADD = \
diff --git a/opal/mca/common/ucx/configure.m4 b/opal/mca/common/ucx/configure.m4
index 6d79f04275..27e07c2005 100644
--- a/opal/mca/common/ucx/configure.m4
+++ b/opal/mca/common/ucx/configure.m4
@@ -23,7 +23,7 @@ AC_DEFUN([MCA_opal_common_ucx_CONFIG],[
           [$2])
 
 
-    # substitute in the things needed to build openib
+    # substitute in the things needed to build common_ucx
     AC_SUBST([common_ucx_CFLAGS])
     AC_SUBST([common_ucx_CPPFLAGS])
     AC_SUBST([common_ucx_LDFLAGS])