diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 344aa7a3ec..ed3feb7068 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-18	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* libfs/Makefile.am: Do not build nfsclient if no networking.
+
 2008-09-18	Miao Yan <yanmiaobest@gmail.com>
 
 	* libfs/src/devfs/devclose.c, libfs/src/devfs/devfs_eval.c,
diff --git a/cpukit/libfs/Makefile.am b/cpukit/libfs/Makefile.am
index fe8562b081..1b907a46dd 100644
--- a/cpukit/libfs/Makefile.am
+++ b/cpukit/libfs/Makefile.am
@@ -6,7 +6,10 @@ include $(top_srcdir)/automake/multilib.am
 include $(top_srcdir)/automake/compile.am
 
 # Pick up nfsclient
-SUBDIRS = src/nfsclient
+if LIBNETWORKING
+NFSCLIENT_SUBDIR= src/nfsclient
+endif
+SUBDIRS = $(NFSCLIENT_SUBDIR)
 DIST_SUBDIRS = $(SUBDIRS)
 
 EXTRA_DIST = README