diff --git a/ompi/config/ompi_check_pvfs2.m4 b/ompi/config/ompi_check_pvfs2.m4
index 5acef1857a..c9184ad962 100644
--- a/ompi/config/ompi_check_pvfs2.m4
+++ b/ompi/config/ompi_check_pvfs2.m4
@@ -95,8 +95,11 @@ AC_DEFUN([OMPI_CHECK_PVFS2],[
             # check for pvfs2
 	    AC_CHECK_HEADERS([pvfs2.h],
 		[AC_MSG_CHECKING([if possible to link PVFS2])
-		    AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pvfs2.h>], 
-				[int i;])],
+		    AC_LINK_IFELSE(
+			[AC_LANG_PROGRAM(
+				[[#include <stdio.h>
+				  #include <pvfs2.h>]],
+				[[PVFS_util_resolve(NULL,NULL,NULL,0);]])],
 			[AC_MSG_RESULT([yes])
 			    ompi_check_pvfs2_happy="yes"],
 			[AC_MSG_RESULT([no])
diff --git a/ompi/mca/fs/pvfs2/Makefile.am b/ompi/mca/fs/pvfs2/Makefile.am
index b3aa4e62bb..ec7d6c50b7 100644
--- a/ompi/mca/fs/pvfs2/Makefile.am
+++ b/ompi/mca/fs/pvfs2/Makefile.am
@@ -48,7 +48,7 @@ AM_CPPFLAGS = $(fs_pvfs2_CPPFLAGS)
 mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_fs_pvfs2_la_SOURCES = $(fs_pvfs2_sources)
-mca_fs_pvfs2_la_LIBADD = $(fs_pvfs_LIBS)
+mca_fs_pvfs2_la_LIBADD = $(fs_pvfs2_LIBS)
 mca_fs_pvfs2_la_LDFLAGS = -module -avoid-version $(fs_pvfs2_LDFLAGS)
 
 noinst_LTLIBRARIES = $(component_noinst)