diff --git a/ChangeLog b/ChangeLog
index 512aaf3a1..9083473fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-12  Mike Kestner  <mkestner@novell.com>
+
+	* sample/gnomevfs/Makefile,am : conditionally build.
+
 2005-01-12  Mike Kestner  <mkestner@novell.com>
 
 	* sample/gnomevfs/*.cs : s/Test.Gnome.VFS/TestGnomeVfs to avoid
diff --git a/sample/gnomevfs/Makefile.am b/sample/gnomevfs/Makefile.am
index a4ffb6853..325de70be 100644
--- a/sample/gnomevfs/Makefile.am
+++ b/sample/gnomevfs/Makefile.am
@@ -1,3 +1,4 @@
+if ENABLE_GNOMEVFS
 TARGETS =			\
 	TestAsync.exe		\
 	TestAsyncStream.exe	\
@@ -13,6 +14,9 @@ TARGETS =			\
 	TestUnlink.exe		\
 	TestVolumes.exe		\
 	TestXfer.exe
+else
+TARGETS =
+endif
 
 assemblies=../../glib/glib-sharp.dll ../../gnomevfs/gnome-vfs-sharp.dll
 references = $(addprefix /r:, $(assemblies)) /r:Mono.GetOptions