diff --git a/ompi/mca/mtl/ofi/Makefile.am b/ompi/mca/mtl/ofi/Makefile.am
index 8f5ba69784..7312ba4fdf 100644
--- a/ompi/mca/mtl/ofi/Makefile.am
+++ b/ompi/mca/mtl/ofi/Makefile.am
@@ -11,7 +11,7 @@
 
 EXTRA_DIST = post_configure.sh
 
-AM_CPPFLAGS = $(opal_common_libfabric_CPPFLAGS)
+AM_CPPFLAGS = $(ompi_mtl_ofi_CPPFLAGS)
 
 dist_ompidata_DATA = help-mtl-ofi.txt
 
@@ -41,9 +41,9 @@ mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_mtl_ofi_la_SOURCES = $(mtl_ofi_sources)
 mca_mtl_ofi_la_LDFLAGS = \
-        $(opal_common_libfabric_LDFLAGS) \
+        $(ompi_mtl_ofi_LDFLAGS) \
         -module -avoid-version
-mca_mtl_ofi_la_LIBADD = $(opal_common_libfabric_LIBADD)
+mca_mtl_ofi_la_LIBADD = $(ompi_mtl_ofi_LIBS)
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_mtl_ofi_la_SOURCES = $(mtl_ofi_sources)
diff --git a/ompi/mca/mtl/ofi/configure.m4 b/ompi/mca/mtl/ofi/configure.m4
index 79df62dd64..39bf83ad99 100644
--- a/ompi/mca/mtl/ofi/configure.m4
+++ b/ompi/mca/mtl/ofi/configure.m4
@@ -2,7 +2,7 @@
 #
 # Copyright (c) 2013-2014 Intel, Inc. All rights reserved
 #
-# Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2014-2015 Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -23,10 +23,7 @@ AC_DEFUN([MCA_ompi_mtl_ofi_POST_CONFIG], [
 AC_DEFUN([MCA_ompi_mtl_ofi_CONFIG],[
     AC_CONFIG_FILES([ompi/mca/mtl/ofi/Makefile])
 
-    AC_MSG_CHECKING([for libfabric support])
-    AS_IF([test $opal_common_libfabric_happy -eq 1],
-          [AC_MSG_RESULT([yes])
-           $1],
-          [AC_MSG_RESULT([no])
-           $2])
+    OPAL_CHECK_LIBFABRIC([ompi_mtl_ofi],
+          [$1],
+          [$2])
 ])dnl