Index: etc/defaults/rc.conf
===================================================================
--- etc/defaults/rc.conf	(revision 333461)
+++ etc/defaults/rc.conf	(working copy)
@@ -629,14 +629,14 @@ linux_enable="NO"	# Linux binary compatibility loaded 
 clear_tmp_enable="NO"	# Clear /tmp at startup.
 clear_tmp_X="YES" 	# Clear and recreate X11-related directories in /tmp
 ldconfig_insecure="NO"	# Set to YES to disable ldconfig security checks
-ldconfig_paths="/usr/lib/compat /usr/local/lib /usr/local/lib/compat/pkg"
+ldconfig_paths="/usr/local/lib /usr/local/lib/compat/pkg /usr/lib /usr/lib/compat /lib"
 			# shared library search paths
 ldconfig32_paths="/usr/lib32 /usr/lib32/compat"
 			# 32-bit compatibility shared library search paths
-ldconfigsoft_paths="/usr/libsoft /usr/libsoft/compat /usr/local/libsoft"
+ldconfigsoft_paths="/usr/local/libsoft /usr/libsoft /usr/libsoft/compat"
 			# soft float compatibility shared library search paths
 			# Note: temporarily with extra stuff for transition
-ldconfig_paths_aout="/usr/lib/compat/aout /usr/local/lib/aout"
+ldconfig_paths_aout="/usr/local/lib/aout /usr/lib/aout /usr/lib/compat/aout"
 			# a.out shared library search paths
 ldconfig_local_dirs="/usr/local/libdata/ldconfig"
 			# Local directories with ldconfig configuration files.
Index: etc/rc.d/ldconfig
===================================================================
--- etc/rc.d/ldconfig	(revision 333461)
+++ etc/rc.d/ldconfig	(working copy)
@@ -17,22 +17,23 @@ stop_cmd=":"
 
 ldconfig_start()
 {
-	local _files _ins
+	local _files _ins _paths _LDC
 
 	_ins=
 	ldconfig=${ldconfig_command}
 	checkyesno ldconfig_insecure && _ins="-i"
 	if [ -x "${ldconfig_command}" ]; then
-		_LDC="/lib /usr/lib"
+		_paths=""
 		for i in ${ldconfig_local_dirs}; do
 			if [ -d "${i}" ]; then
 				_files=`find ${i} -type f`
 				if [ -n "${_files}" ]; then
-					ldconfig_paths="${ldconfig_paths} `cat ${_files} | sort -u`"
+					_paths="${_paths} `cat ${_files} | sort -ru`"
 				fi
 			fi
 		done
-		for i in ${ldconfig_paths} /etc/ld-elf.so.conf; do
+		_LDC=""
+		for i in ${_paths} ${ldconfig_paths} /etc/ld-elf.so.conf; do
 			if [ -r "${i}" ]; then
 				_LDC="${_LDC} ${i}"
 			fi
@@ -42,16 +43,17 @@ ldconfig_start()
 
 		case `sysctl -n hw.machine_arch` in
 		amd64|powerpc64)
+			_paths=""
 			for i in ${ldconfig_local32_dirs}; do
 				if [ -d "${i}" ]; then
 					_files=`find ${i} -type f`
 					if [ -n "${_files}" ]; then
-						ldconfig32_paths="${ldconfig32_paths} `cat ${_files} | sort -u`"
+						_paths="${_paths} `cat ${_files} | sort -ru`"
 					fi
 				fi
 			done
 			_LDC=""
-			for i in ${ldconfig32_paths}; do
+			for i in ${_paths} ${ldconfig32_paths}; do
 				if [ -r "${i}" ]; then
 					_LDC="${_LDC} ${i}"
 				fi
@@ -64,16 +66,17 @@ ldconfig_start()
 
 		case `sysctl -n hw.machine_arch` in
 		armv[67])
+			_paths=""
 			for i in ${ldconfig_localsoft_dirs}; do
 				if [ -d "${i}" ]; then
 					_files=`find ${i} -type f`
 					if [ -n "${_files}" ]; then
-						ldconfigsoft_paths="${ldconfigsoft_paths} `cat ${_files} | sort -u`"
+						_paths="${_paths} `cat ${_files} | sort -ru`"
 					fi
 				fi
 			done
 			_LDC=""
-			for i in ${ldconfigsoft_paths}; do
+			for i in ${_paths} ${ldconfigsoft_paths}; do
 				if [ -r "${i}" ]; then
 					_LDC="${_LDC} ${i}"
 				fi
@@ -87,10 +90,8 @@ ldconfig_start()
 		# Legacy aout support for i386 only
 		case `sysctl -n hw.machine_arch` in
 		i386)
-			# Default the a.out ldconfig path.
-			: ${ldconfig_paths_aout=${ldconfig_paths}}
 			_LDC=""
-			for i in /usr/lib/aout ${ldconfig_paths_aout} /etc/ld.so.conf; do
+			for i in ${ldconfig_paths_aout} /etc/ld.so.conf; do
 				if [ -r "${i}" ]; then
 					_LDC="${_LDC} ${i}"
 				fi