diff --git a/bin/Makefile b/bin/Makefile
index b9f90a064473..8d30ac61fb71 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -1,8 +1,12 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id: Makefile,v 1.8 1997/12/06 04:19:41 sef Exp $
+#	$Id: Makefile,v 1.9 1997/12/07 02:26:12 peter Exp $
 
-SUBDIR= cat chio chmod cp csh date dd df domainname echo ed expr hostname \
-	kill ln ls mkdir mv pax ps pwd rcp rm rmail rmdir sh sleep \
+SUBDIR= cat chio chmod cp date dd domainname echo ed expr hostname \
+	kill ln ls mkdir mv pax pwd rcp rm rmail rmdir sleep \
 	stty sync test
 
+.if ${MACHINE_ARCH} == "i386"
+SUBDIR+=csh df ps sh
+.endif
+
 .include <bsd.subdir.mk>
diff --git a/sbin/Makefile b/sbin/Makefile
index ae0552290676..93a5f19b70be 100644
--- a/sbin/Makefile
+++ b/sbin/Makefile
@@ -2,18 +2,23 @@
 
 # XXX MISSING:		icheck ncheck
 
-SUBDIR= adjkerntz badsect ccdconfig clri disklabel dmesg dset dump dumpfs \
+SUBDIR= disklabel dmesg dset dump dumpfs \
 	dumpon fsck fsdb fsirand ifconfig init ipfw \
-	kldload kldstat kldunload md5 mknod modload \
-	modunload mount mount_cd9660 mount_ext2fs \
+	md5 mknod \
+	mount mount_cd9660 mount_ext2fs \
 	mount_nfs mount_null mount_portal mount_std \
 	mount_umap mount_union mountd newfs nfsd nfsiod \
-	nologin ping quotacheck reboot restore route routed savecore scsi \
-	scsiformat shutdown slattach startslip spppcontrol swapon tunefs \
+	nologin quotacheck reboot restore route routed \
+	scsiformat shutdown slattach startslip spppcontrol tunefs \
 	umount
 
 .if exists(${.CURDIR}/${MACHINE})
 SUBDIR+= ${MACHINE}
 .endif
 
+.if ${MACHINE_ARCH} == "i386"
+SUBDIR+=adjkerntz badsect ccdconfig clri kldload kldstat kldunload ping
+SUBDIR+=modload modunload savecore scsi swapon
+.endif
+
 .include <bsd.subdir.mk>
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index bd2dabfa682c..b183566c94b7 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -1,41 +1,48 @@
 #	From: @(#)Makefile	8.3 (Berkeley) 1/7/94
-#	$Id: Makefile,v 1.92 1997/12/13 09:59:32 msmith Exp $
+#	$Id: Makefile,v 1.93 1997/12/15 20:52:24 helbig Exp $
 
 # XXX MISSING:		deroff diction graph learn plot
 #			spell spline struct units xsend
 # XXX Use GNU versions: apropos bc dc diff grep ld man patch ptx uucp whatis
 # Moved to secure: bdes
 #
-SUBDIR=	apply ar at banner basename biff brandelf c89 calendar \
+SUBDIR=	apply at banner basename biff c89 calendar \
 	cap_mkdb chat checknr chflags chpass cksum col colcrt colldef colrm \
 	column comm compile_et compress chkey cpp ctags cut dig \
-	dirname dnsquery doscmd du ee env error expand \
+	dirname dnsquery du ee env error expand \
 	f2c false fetch file file2c \
-	find finger fmt fold fpr from fsplit fstat ftp gcore gencat getopt \
-	global gprof head hexdump host id indent ipcrm ipcs \
-	join jot kdump ktrace key keyinfo keyinit keylogin keylogout killall \
+	find finger fmt fold fpr from fsplit ftp gencat getopt \
+	global head hexdump host id indent \
+	join jot key keyinfo keyinit keylogin keylogout killall \
 	lam last lastcomm leave lex limits locate lock lockf logger login \
-	logname lorder lsvfs m4 mail make mesg mkdep mkfifo mklocale mkstr \
-	mk_cmds modstat more msgs mt ncal netstat newkey nfsstat nice \
+	logname lsvfs m4 mail make mesg mkdep mkfifo mklocale mkstr \
+	mk_cmds more msgs ncal netstat newkey nfsstat nice \
 	nm nohup opieinfo opiekey opiepasswd pagesize passwd paste pr printenv \
-	printf quota ranlib rdist renice rev rlogin rpcgen \
+	printf quota rdist renice rev rlogin rpcgen \
 	rpcinfo rs rsh rup ruptime rusers rwall \
 	rwho script sed shar showmount size soelim split \
-	strings	strip su symorder talk tconv tcopy tee tftp time \
-	tip tn3270 top touch tput tr true truss tset tsort tty ul uname \
+	strings	su symorder talk tconv tcopy tee tftp time \
+	tip tn3270 touch tput tr true tset tsort tty ul uname \
 	unexpand unifdef uniq units unvis users uudecode uuencode vacation \
-	vgrind vi vis w wall wc what whereis which who whois window \
+	vgrind vi vis wall wc what whereis which who whois window \
 	write xargs xinstall xlint xstr yacc yes ypcat ypmatch ypwhich
-SUBDIR+=gprof4 minigzip
+SUBDIR+=minigzip
+
+.if defined(RELEASEDIR) || !exists(${.CURDIR}/../kerberosIV) || defined(NOCRYPT) || !defined(MAKE_KERBEROS4)
+# releases do need both
+SUBDIR+=telnet
+.endif
+
+.if ${MACHINE_ARCH} == "i386"
+# Things that don't compile on alpha:
+SUBDIR+=ar brandelf doscmd fstat gcore gprof gprof4 ipcrm ipcs kdump ktrace \
+	modstat mt ranlib strip top truss w lorder
 
 .if !defined(NOTCL) && exists (${.CURDIR}/../contrib/tcl) && \
 	exists(${.CURDIR}/tclsh) && exists (${.CURDIR}/../lib/libtcl)
 SUBDIR+=tclsh
 .endif
 
-.if defined(RELEASEDIR) || !exists(${.CURDIR}/../kerberosIV) || defined(NOCRYPT) || !defined(MAKE_KERBEROS4)
-# releases do need both
-SUBDIR+=telnet
 .endif
 
 # Cmp, look and tail all use mmap, so new-VM only.