Index: head/etc/rc.d/apmd
===================================================================
--- head/etc/rc.d/apmd	(revision 114767)
+++ head/etc/rc.d/apmd	(revision 114768)
@@ -1,39 +1,39 @@
 #!/bin/sh
 #
 # $NetBSD: apmd,v 1.5 2002/03/22 04:33:58 thorpej Exp $
 # $FreeBSD$
 #
 
 # PROVIDE: apmd
 # REQUIRE: DAEMON apm
 # BEFORE:  LOGIN
 # KEYWORD: FreeBSD NetBSD
 
 . /etc/rc.subr
 
 name="apmd"
 rcvar=`set_rcvar`
 command="/usr/sbin/${name}"
 
 case ${OSTYPE} in
 FreeBSD)
 	start_precmd="apmd_prestart"
 	;;
 esac
 
 apmd_prestart()
 {
 	case `${SYSCTL_N} hw.machine_arch` in
-	i386|amd64)
+	i386)
 		# Start apm if it is not already running
 		/etc/rc.d/apm forcestatus > /dev/null || /etc/rc.d/apm forcestart
 		;;
 	*)
 		return 1
 		;;
 	esac
 	return 0
 }
 
 load_rc_config $name
 run_rc_command "$1"
Index: head/etc/rc.d/archdep
===================================================================
--- head/etc/rc.d/archdep	(revision 114767)
+++ head/etc/rc.d/archdep	(revision 114768)
@@ -1,70 +1,70 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: archdep
 # REQUIRE: LOGIN
 # BEFORE: abi
 # KEYWORD: FreeBSD
 
 . /etc/rc.subr
 
 name=archdep
 load_rc_config $name
 
 # should we print out unaligned access warnings?
 #
 unaligned_warnings()
 {
 	if ! checkyesno unaligned_print; then
 		sysctl machdep.unaligned_print=0
 	fi
 }
 
 # Alpha OSF/1 binary emulation
 #
 osf1_compat()
 {
 	if checkyesno osf1_enable; then
 		echo -n ' OSF/1'
 		if ! kldstat -v | grep osf1_ecoff > /dev/null; then
 			kldload osf1 > /dev/null 2>&1
 		fi
 	fi
 }
 
 # SCO binary emulation
 #
 ibcs2_compat()
 {
 	if checkyesno ibcs2_enable; then
 		echo -n ' ibcs2'
 		kldload ibcs2 > /dev/null 2>&1
 		case ${ibcs2_loaders} in
 		[Nn][Oo])
 			;;
 		*)
 			for i in ${ibcs2_loaders}; do
 				kldload ibcs2_$i > /dev/null 2>&1
 			done
 			;;
 		esac
 	fi
 }
 
 _arch=`${SYSCTL_N} hw.machine`
 echo -n "Initial $_arch initialization:"
 case $_arch in
-i386|amd64)
+i386)
 	ibcs2_compat
 	;;
 alpha)
 	osf1_compat
 	unaligned_warnings
 	;;
 ia64)
 	unaligned_warnings
 	;;
 esac
 echo '.'