diff --git a/libexec/bootpd/.indent.pro b/libexec/bootpd/.indent.pro
deleted file mode 100644
index 177ed731e1b9..000000000000
--- a/libexec/bootpd/.indent.pro
+++ /dev/null
@@ -1,3 +0,0 @@
- -nbad -nbap -nbbb -nbc -br -bli4 -c33 -cd33  -cdb  -ce -ci4
- -cli0 -cp1 -d0 -di0 -nfc1 -nfca -i4 -ip4 -l75 -lp -npcs
- -psl -sc -nsob -nss -ts4
diff --git a/libexec/bootpd/Makefile b/libexec/bootpd/Makefile
index e92396876258..659e3aa50832 100644
--- a/libexec/bootpd/Makefile
+++ b/libexec/bootpd/Makefile
@@ -1,11 +1,11 @@
 # bootpd/Makefile
-# $Id: Makefile,v 1.2 1995/05/30 05:45:45 rgrimes Exp $
+# $Id: Makefile,v 1.3 1995/07/25 23:38:40 wpaul Exp $
 
 PROG=	bootpd
 CFLAGS+= -DETC_ETHERS
 CFLAGS+= -DSYSLOG -DDEBUG -DVEND_CMU
 
-SUBDIR= tools
+SUBDIR= bootpgw tools
 
 SRCS=	bootpd.c dovend.c readfile.c hash.c dumptab.c \
 	 lookup.c getif.c hwaddr.c report.c tzone.c rtmsg.c
diff --git a/libexec/bootpd/bootpd.c b/libexec/bootpd/bootpd.c
index 745de7e22d8f..6ab769e49845 100644
--- a/libexec/bootpd/bootpd.c
+++ b/libexec/bootpd/bootpd.c
@@ -1258,7 +1258,7 @@ dovend_rfc1048(bp, hp, bootsize)
 			byte *p, *ep;
 			byte tag, len;
 			short msgsz = 0;
-			
+
 			p = vp + 4;
 			ep = p + BP_VEND_LEN - 4;
 			while (p < ep) {
diff --git a/libexec/bootpd/getether.c b/libexec/bootpd/getether.c
index a96a4bb1b2ae..71d576a36a09 100644
--- a/libexec/bootpd/getether.c
+++ b/libexec/bootpd/getether.c
@@ -106,7 +106,7 @@ getether(ifname, eap)
 #endif /* SUNOS */
 
 
-#if defined(__386BSD__) || defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__)
 /* Thanks to John Brezak <brezak@ch.hp.com> for this code. */
 #include <sys/ioctl.h>
 #include <net/if.h>