diff --git a/share/man/man4/ndis.4 b/share/man/man4/ndis.4
index 1531b0ced897..4f0b0ab2ed22 100644
--- a/share/man/man4/ndis.4
+++ b/share/man/man4/ndis.4
@@ -121,7 +121,7 @@ which can be configured via the
 .Xr sysctl 8
 command.
 .Sh DEPRECATION NOTICE
-The PC Card attachment of this driver is scheduled for removal prior to the release of
+This driver is scheduled for removal prior to the release of
 .Fx 13.0
 .Sh DIAGNOSTICS
 .Bl -diag
diff --git a/sys/dev/if_ndis/if_ndis_pccard.c b/sys/dev/if_ndis/if_ndis_pccard.c
index aa9735eba1ea..85b23a18d11a 100644
--- a/sys/dev/if_ndis/if_ndis_pccard.c
+++ b/sys/dev/if_ndis/if_ndis_pccard.c
@@ -304,7 +304,7 @@ ndis_attach_pccard(dev)
 
 	error = ndis_attach(dev);
 	if (error == 0)
-		gone_in_dev(dev, 13, "pccard removed");
+		gone_in_dev(dev, 13, "ndis removed");
 
 fail:
 	return(error);
diff --git a/sys/dev/if_ndis/if_ndis_pci.c b/sys/dev/if_ndis/if_ndis_pci.c
index b9d860f9d889..ba83652d1289 100644
--- a/sys/dev/if_ndis/if_ndis_pci.c
+++ b/sys/dev/if_ndis/if_ndis_pci.c
@@ -337,6 +337,9 @@ ndis_attach_pci(dev)
 		sc->ndis_devidx = devidx;
 
 	error = ndis_attach(dev);
+	if (error == 0)
+		gone_in_dev(dev, 13, "ndis removed");
+
 
 fail:
 	return(error);
diff --git a/sys/dev/if_ndis/if_ndis_usb.c b/sys/dev/if_ndis/if_ndis_usb.c
index 7ed8e37b0e53..c696a7bf720c 100644
--- a/sys/dev/if_ndis/if_ndis_usb.c
+++ b/sys/dev/if_ndis/if_ndis_usb.c
@@ -199,6 +199,8 @@ ndisusb_attach(device_t self)
 	if (ndis_attach(self) != 0)
 		return (ENXIO);
 
+	gone_in_dev(self, 13, "ndis removed");
+
 	return (0);
 }