diff --git a/usr.sbin/sade/devices.c b/usr.sbin/sade/devices.c
index 30993760b192..169d020aaec9 100644
--- a/usr.sbin/sade/devices.c
+++ b/usr.sbin/sade/devices.c
@@ -273,6 +273,7 @@ deviceGetAll(void)
     if (ioctl(s, SIOCGIFCONF, (char *) &ifc) < 0)
 	goto skipif;	/* Jump over network iface probing */
 
+    close(s);
     ifflags = ifc.ifc_req->ifr_flags;
     end = (struct ifreq *) (ifc.ifc_buf + ifc.ifc_len);
     for (ifptr = ifc.ifc_req; ifptr < end; ifptr++) {
@@ -319,6 +320,7 @@ deviceGetAll(void)
 loopend:
 	if (ifptr->ifr_addr.sa_len)	/* I'm not sure why this is here - it's inherited */
 	    ifptr = (struct ifreq *)((caddr_t)ifptr + ifptr->ifr_addr.sa_len - sizeof(struct sockaddr));
+	close(s);
     }
 
 skipif:
diff --git a/usr.sbin/sade/system.c b/usr.sbin/sade/system.c
index b1c2e8ec9a6d..deb9e9f90812 100644
--- a/usr.sbin/sade/system.c
+++ b/usr.sbin/sade/system.c
@@ -56,8 +56,13 @@ intr_reboot(dialogMenuItem *self)
 static int
 intr_restart(dialogMenuItem *self)
 {
-    int ret;
+    int ret, fd, fdmax;
+
+    mediaClose();
     free_variables();
+    fdmax = getdtablesize();
+    for (fd = 3; fd < fdmax; fd++)
+	close(fd);
     ret = execl(StartName, StartName, (char *)NULL);
     msgDebug("execl failed (%s)\n", strerror(errno));
     /* NOTREACHED */
diff --git a/usr.sbin/sysinstall/devices.c b/usr.sbin/sysinstall/devices.c
index 30993760b192..169d020aaec9 100644
--- a/usr.sbin/sysinstall/devices.c
+++ b/usr.sbin/sysinstall/devices.c
@@ -273,6 +273,7 @@ deviceGetAll(void)
     if (ioctl(s, SIOCGIFCONF, (char *) &ifc) < 0)
 	goto skipif;	/* Jump over network iface probing */
 
+    close(s);
     ifflags = ifc.ifc_req->ifr_flags;
     end = (struct ifreq *) (ifc.ifc_buf + ifc.ifc_len);
     for (ifptr = ifc.ifc_req; ifptr < end; ifptr++) {
@@ -319,6 +320,7 @@ deviceGetAll(void)
 loopend:
 	if (ifptr->ifr_addr.sa_len)	/* I'm not sure why this is here - it's inherited */
 	    ifptr = (struct ifreq *)((caddr_t)ifptr + ifptr->ifr_addr.sa_len - sizeof(struct sockaddr));
+	close(s);
     }
 
 skipif:
diff --git a/usr.sbin/sysinstall/system.c b/usr.sbin/sysinstall/system.c
index b1c2e8ec9a6d..deb9e9f90812 100644
--- a/usr.sbin/sysinstall/system.c
+++ b/usr.sbin/sysinstall/system.c
@@ -56,8 +56,13 @@ intr_reboot(dialogMenuItem *self)
 static int
 intr_restart(dialogMenuItem *self)
 {
-    int ret;
+    int ret, fd, fdmax;
+
+    mediaClose();
     free_variables();
+    fdmax = getdtablesize();
+    for (fd = 3; fd < fdmax; fd++)
+	close(fd);
     ret = execl(StartName, StartName, (char *)NULL);
     msgDebug("execl failed (%s)\n", strerror(errno));
     /* NOTREACHED */