diff --git a/acinclude.m4 b/acinclude.m4
index f39237b38c..abc6062e93 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1445,6 +1445,7 @@ else
 fi
 AC_SUBST(XBSA_CFLAGS)
 AC_SUBST(XBSA_XLIBS) 
+XLIBS="$XBSA_XLIBS $XLIBS"
 
 dnl checks for header files.
 AC_HEADER_STDC
diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4
index ec88048167..6c9fe6815f 100644
--- a/src/cf/osconf.m4
+++ b/src/cf/osconf.m4
@@ -6,7 +6,7 @@ RXDEBUG="-DRXDEBUG"
 SHLIB_SUFFIX="so"
 CCOBJ="\$(CC)"
 MT_CC="\$(CC)"
-XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} ${LIB_libintl}"
+XLIBS="${LIB_AFSDB} ${LIB_libintl}"
 MT_LIBS='-lpthread ${XLIBS}'
 XCFLAGS=
 
@@ -287,7 +287,7 @@ case $AFS_SYSNAME in
 		EXTRA_VLIBOBJS="fstab.o"
 		SHLIB_LINKER="${CC} \${ARCHFLAGS} -dynamiclib"
 		SHLIB_SUFFIX="dylib"
-		XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} -framework CoreFoundation"
+		XLIBS="${LIB_AFSDB} -framework CoreFoundation"
 		;;
 
 	*_darwin_80)
@@ -304,7 +304,7 @@ case $AFS_SYSNAME in
 		SHLIB_LINKER="${CC} \${ARCHFLAGS} -dynamiclib"
 		SHLIB_SUFFIX="dylib"
 		RANLIB="ranlib -c"
-		XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} -framework CoreFoundation"
+		XLIBS="${LIB_AFSDB} -framework CoreFoundation"
 		;;
 
 	*_darwin_90)
@@ -321,7 +321,7 @@ case $AFS_SYSNAME in
 		SHLIB_LINKER="${CC} \${ARCHFLAGS} -dynamiclib"
 		SHLIB_SUFFIX="dylib"
 		RANLIB="ranlib -c"
-		XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} -framework CoreFoundation"
+		XLIBS="${LIB_AFSDB} -framework CoreFoundation"
 		;;
 
 	arm_darwin_100)
@@ -341,7 +341,7 @@ case $AFS_SYSNAME in
 		SHLIB_LINKER="${CC} -dynamiclib"
 		SHLIB_SUFFIX="dylib"
 		RANLIB="ranlib"
-		XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} -framework CoreFoundation"
+		XLIBS="${LIB_AFSDB} -framework CoreFoundation"
 		;;
 
 	*_darwin_100 | *_darwin_110 | *_darwin_120 | *_darwin_130 | *_darwin_140 )
@@ -360,7 +360,7 @@ case $AFS_SYSNAME in
 		SHLIB_LINKER="${CC} \${ARCHFLAGS} -dynamiclib"
 		SHLIB_SUFFIX="dylib"
 		RANLIB="ranlib"
-		XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} -framework CoreFoundation"
+		XLIBS="${LIB_AFSDB} -framework CoreFoundation"
 		;;
 
 	ppc_linux*)