diff --git a/lnet/utils/Makefile.am b/lnet/utils/Makefile.am
index 9f28a28..d628036 100644
--- a/lnet/utils/Makefile.am
+++ b/lnet/utils/Makefile.am
@@ -38,7 +38,10 @@
 #COMPILE = $(CC) -Wall -g -I$(srcdir)/../include -I../../include
 #LINK = $(CC) -o $@
 
+if LIBLUSTRE
 LIBCFS= $(top_builddir)/libcfs/libcfs/libcfs.a
+endif
+
 LIBCFSUTIL= $(top_builddir)/libcfs/libcfs/libcfsutil.a
 
 if LIBLUSTRE
diff --git a/lustre/tests/Makefile.am b/lustre/tests/Makefile.am
index 0836686..0933af8 100644
--- a/lustre/tests/Makefile.am
+++ b/lustre/tests/Makefile.am
@@ -1,4 +1,6 @@
+if LIBLUSTRE
 LIBCFS := $(top_builddir)/libcfs/libcfs/libcfs.a
+endif
 
 # Lustre test Makefile
 AM_CPPFLAGS = $(LLCPPFLAGS) -I/opt/lam/include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DLUSTRE_UTILS
diff --git a/lustre/tests/mpi/Makefile.am b/lustre/tests/mpi/Makefile.am
index 9344098..6630462 100644
--- a/lustre/tests/mpi/Makefile.am
+++ b/lustre/tests/mpi/Makefile.am
@@ -1,7 +1,9 @@
 # Lustre MPI test Makefile
 AM_CPPFLAGS = $(LLCPPFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DLUSTRE_UTILS
 AM_CFLAGS = $(LLCFLAGS)
+if LIBLUSTRE
 LIBCFS :=  $(top_builddir)/libcfs/libcfs/libcfs.a
+endif
 
 CC = @MPICC_WRAPPER@
 
diff --git a/lustre/utils/Makefile.am b/lustre/utils/Makefile.am
index 359b690..a857875 100644
--- a/lustre/utils/Makefile.am
+++ b/lustre/utils/Makefile.am
@@ -9,8 +9,10 @@ AM_CPPFLAGS=$(LLCPPFLAGS) -DLUSTRE_UTILS=1
 AM_LDFLAGS := -L$(top_builddir)/lnet/utils
 
 LIBPTLCTL := $(top_builddir)/lnet/utils/libptlctl.a \
-	     $(top_builddir)/libcfs/libcfs/libcfsutil.a \
-	     $(top_builddir)/libcfs/libcfs/libcfs.a
+	     $(top_builddir)/libcfs/libcfs/libcfsutil.a
+if LIBLUSTRE
+LIBPTLCTL += $(top_builddir)/libcfs/libcfs/libcfs.a
+endif
 
 sbin_scripts = lrun
 bin_scripts = llstat llobdstat plot-llstat llbackup