diff --git a/ChangeLog b/ChangeLog
index 0783425368..426a588872 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jan  6 09:42:34 CET 2009 Daniel Veillard <veillard@redhat.com>
+
+	* src/storage_backend_fs.c: Make mntent.h specific to the FS storage
+	  backend, patch by John Levon
+
 Mon Jan  5 2009 14:53:48 CET John Levon <john.levon@sun.com>
 
 	split up linker script, as described below and in
diff --git a/src/storage_backend_fs.c b/src/storage_backend_fs.c
index d0d8224383..c619dfc626 100644
--- a/src/storage_backend_fs.c
+++ b/src/storage_backend_fs.c
@@ -31,7 +31,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include <mntent.h>
 #include <string.h>
 
 #include <libxml/parser.h>
@@ -242,6 +241,9 @@ static int virStorageBackendProbeFile(virConnectPtr conn,
 }
 
 #if WITH_STORAGE_FS
+
+#include <mntent.h>
+
 struct _virNetfsDiscoverState {
     const char *host;
     virStoragePoolSourceList list;