diff --git a/base/fhs/fhs-3-lib.sh b/base/fhs/fhs-3-lib.sh
index d07beb683..381a227ba 100644
--- a/base/fhs/fhs-3-lib.sh
+++ b/base/fhs/fhs-3-lib.sh
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../fhs/fhs-3-lib.sh
-# Copyright (C) 2006 - 2010 The OpenSDE Project
+# Copyright (C) 2006 - 2011 The OpenSDE Project
 #
 # More information can be found in the files COPYING and README.
 #
@@ -16,17 +16,16 @@ lib=
 
 case $arch_machine in
 	powerpc64|sparc64|x86_64|mips64)
-		lib=lib64 ;;
+		lib="lib${SDECFG_ABI_DEFAULT}" ;;
 esac
 
 for x in '' 'usr/' 'usr/local/'; do
 	if [ -z "$lib" ]; then
 		echo "m ${x}lib"
 	else
-		if [ "$SDECFG_MULTILIB" = 1 ]; then
-			echo "m ${x}lib32"
-		fi
-		echo "m ${x}lib64"
+		for abi in $arch_abis; do
+			echo "m ${x}lib${abi}"
+		done
 		echo "l ${x}lib $lib"
 	fi
 done