diff --git a/etc/rc b/etc/rc
index 19ca849ab185..7ed64438c54e 100644
--- a/etc/rc
+++ b/etc/rc
@@ -631,7 +631,7 @@ if [ -x /sbin/ldconfig ]; then
 	esac
 
 	# Legacy aout support for i386 only
-	case `sysctl -n hw.machine` in
+	case `sysctl -n hw.machine_arch` in
 	i386)
 		# Default the a.out ldconfig path.
 		: ${ldconfig_paths_aout=${ldconfig_paths}}
@@ -778,7 +778,7 @@ fi
 
 # Configure implementation specific stuff
 #
-arch=`uname -m`
+arch=`uname -p`
 if [ -r /etc/rc.${arch} ]; then
 	. /etc/rc.${arch}
 fi