diff --git a/sys/nfs/nfs_boot.c b/sys/nfs/nfs_boot.c
index 920b9fd247b2..cd36fa56a503 100644
--- a/sys/nfs/nfs_boot.c
+++ b/sys/nfs/nfs_boot.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_boot.c,v 1.33 1997/05/27 23:37:39 gwr Exp $	*/
+/*	$NetBSD: nfs_boot.c,v 1.34 1997/08/14 15:50:05 drochner Exp $	*/
 
 /*
  * Copyright (c) 1995 Adam Glass, Gordon Ross
@@ -115,6 +115,7 @@ nfs_boot_init(nd, procp)
 	struct proc *procp;
 {
 	struct ifreq ireq;
+	struct ifaliasreq iareq;
 	struct in_addr my_ip, gw_ip;
 	struct sockaddr_in bp_sin;
 	struct sockaddr_in *sin;
@@ -183,12 +184,19 @@ nfs_boot_init(nd, procp)
 	 * Do enough of ifconfig(8) so that the chosen interface
 	 * can talk to the servers.  (just set the address)
 	 */
-	sin = (struct sockaddr_in *)&ireq.ifr_addr;
-	bzero((caddr_t)sin, sizeof(*sin));
+	bzero(&iareq, sizeof(iareq));
+	bcopy(ifp->if_xname, iareq.ifra_name, IFNAMSIZ);
+	sin = (struct sockaddr_in *)&iareq.ifra_addr;
 	sin->sin_len = sizeof(*sin);
 	sin->sin_family = AF_INET;
 	sin->sin_addr.s_addr = my_ip.s_addr;
-	error = ifioctl(so, SIOCSIFADDR, (caddr_t)&ireq, procp);
+#ifdef NFS_BOOT_NETMASK
+	sin = (struct sockaddr_in *)&iareq.ifra_mask;
+	sin->sin_len = sizeof(*sin);
+	sin->sin_family = AF_INET;
+	sin->sin_addr.s_addr = htonl(NFS_BOOT_NETMASK);
+#endif
+	error = ifioctl(so, SIOCAIFADDR, (caddr_t)&iareq, procp);
 	if (error) {
 		printf("nfs_boot: set if addr, error=%d\n", error);
 		goto out;
@@ -268,11 +276,13 @@ nfs_boot_init(nd, procp)
 		goto out;
 	}
 
+#if 0
 	error = bp_getfile(&nd->nd_boot, "swap", &nd->nd_swap);
 	if (error) {
 		printf("nfs_boot: bootparam get swap: %d", error);
 		error = 0;
 	}
+#endif
 
  out:
 	if (so) soclose(so);
diff --git a/sys/nfs/nfsdiskless.h b/sys/nfs/nfsdiskless.h
index ecfe87d0a3b7..bb89373d8da6 100644
--- a/sys/nfs/nfsdiskless.h
+++ b/sys/nfs/nfsdiskless.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfsdiskless.h,v 1.11 1997/05/27 23:37:43 gwr Exp $	*/
+/*	$NetBSD: nfsdiskless.h,v 1.12 1997/08/14 15:50:06 drochner Exp $	*/
 
 /*
  * Copyright (c) 1991, 1993
@@ -58,7 +58,9 @@ struct nfs_dlmount {
 struct nfs_diskless {
 	struct sockaddr_in nd_boot; 	/* Address of boot server */
 	struct nfs_dlmount nd_root; 	/* Mount info for root */
+#if 0
 	struct nfs_dlmount nd_swap; 	/* Mount info for swap */
+#endif
 };
 
 int nfs_boot_init __P((struct nfs_diskless *nd, struct proc *procp));