diff --git a/gio/fam/fam-module.c b/gio/fam/fam-module.c
index 79e49155d..c25da33bb 100644
--- a/gio/fam/fam-module.c
+++ b/gio/fam/fam-module.c
@@ -47,6 +47,8 @@ g_io_module_query (void)
   char *eps[] = {
     G_LOCAL_DIRECTORY_MONITOR_EXTENSION_POINT_NAME,
     G_LOCAL_FILE_MONITOR_EXTENSION_POINT_NAME,
+    G_NFS_DIRECTORY_MONITOR_EXTENSION_POINT_NAME,
+    G_NFS_FILE_MONITOR_EXTENSION_POINT_NAME,
     NULL
   };
   return g_strdupv (eps);
diff --git a/gio/fam/gfamdirectorymonitor.c b/gio/fam/gfamdirectorymonitor.c
index 72a75d2d2..0bc69b5a6 100644
--- a/gio/fam/gfamdirectorymonitor.c
+++ b/gio/fam/gfamdirectorymonitor.c
@@ -149,5 +149,9 @@ g_fam_directory_monitor_register (GIOModule *module)
 				  G_TYPE_FAM_DIRECTORY_MONITOR,
 				  "fam",
 				  10);
+  g_io_extension_point_implement (G_NFS_DIRECTORY_MONITOR_EXTENSION_POINT_NAME,
+				  G_TYPE_FAM_DIRECTORY_MONITOR,
+				  "fam",
+				  10);
 }
 
diff --git a/gio/fam/gfamfilemonitor.c b/gio/fam/gfamfilemonitor.c
index 47e207fec..79983c71c 100644
--- a/gio/fam/gfamfilemonitor.c
+++ b/gio/fam/gfamfilemonitor.c
@@ -147,5 +147,9 @@ g_fam_file_monitor_register (GIOModule *module)
 				  G_TYPE_FAM_FILE_MONITOR,
 				  "fam",
 				  10);
+  g_io_extension_point_implement (G_NFS_FILE_MONITOR_EXTENSION_POINT_NAME,
+				  G_TYPE_FAM_FILE_MONITOR,
+				  "fam",
+				  10);
 }