diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
index ad34ea188..3c55096a4 100644
--- a/grub-core/kern/ieee1275/init.c
+++ b/grub-core/kern/ieee1275/init.c
@@ -264,6 +264,8 @@ grub_machine_init (void)
 void
 grub_machine_fini (void)
 {
+  if (grub_grubnet_fini)
+    grub_grubnet_fini ();
   grub_ofdisk_fini ();
   grub_console_fini ();
 }
diff --git a/grub-core/net/drivers/ieee1275/ofnet.c b/grub-core/net/drivers/ieee1275/ofnet.c
index 751583e9d..9789f2261 100644
--- a/grub-core/net/drivers/ieee1275/ofnet.c
+++ b/grub-core/net/drivers/ieee1275/ofnet.c
@@ -225,6 +225,10 @@ GRUB_MOD_INIT(ofnet)
 
 GRUB_MOD_FINI(ofnet)
 {
+  struct grub_net_card *card;
+  FOR_NET_CARDS (card) 
+    if (card->driver && !grub_strcmp (card->driver->name, "ofnet"))
+      card->driver->fini (card);
   grub_net_card_driver_unregister (&ofdriver);
   grub_getbootp = NULL;
 }
diff --git a/grub-core/net/net.c b/grub-core/net/net.c
index 380eec3b5..c7732ecbf 100644
--- a/grub-core/net/net.c
+++ b/grub-core/net/net.c
@@ -1021,6 +1021,15 @@ grub_cmd_dhcpopt (struct grub_command *cmd __attribute__ ((unused)),
 		     "unrecognised format specification %s", args[3]);
 }
 
+static void
+grub_grubnet_fini_real (void)
+{
+  struct grub_net_card *card;
+  FOR_NET_CARDS (card)
+    if (card->driver)
+      card->driver->fini (card);
+}
+
 static struct grub_fs grub_net_fs =
   {
     .name = "netfs",
@@ -1060,6 +1069,7 @@ GRUB_MOD_INIT(net)
   grub_fs_register (&grub_net_fs);
   grub_net_open = grub_net_open_real;
   grub_file_net_seek = grub_net_seek_real;
+  grub_grubnet_fini = grub_grubnet_fini_real;
 }
 
 GRUB_MOD_FINI(net)
@@ -1074,4 +1084,5 @@ GRUB_MOD_FINI(net)
   grub_fs_unregister (&grub_net_fs);
   grub_net_open = NULL;
   grub_file_net_seek = NULL;
+  grub_grubnet_fini = NULL;
 }
diff --git a/include/grub/net.h b/include/grub/net.h
index f9745acec..006ec0686 100644
--- a/include/grub/net.h
+++ b/include/grub/net.h
@@ -239,6 +239,7 @@ typedef struct grub_net
 
 extern grub_net_t (*EXPORT_VAR (grub_net_open)) (const char *name);
 extern grub_err_t (*EXPORT_VAR (grub_file_net_seek)) (struct grub_file *file, grub_off_t offset);
+void (*EXPORT_VAR (grub_grubnet_fini)) (void);
 
 struct grub_net_network_level_interface
 {