Index: kitsh/buildsrc/kitsh-0.0/aclocal.m4
==================================================================
--- kitsh/buildsrc/kitsh-0.0/aclocal.m4
+++ kitsh/buildsrc/kitsh-0.0/aclocal.m4
@@ -212,17 +212,28 @@
 
 		if test "$projlibfiles" = ' '; then
 			projlibfiles=''
 		fi
 
+		projlibextra_static=''
 		for libfile in ${projlibfilesnostub}; do
 			if test -f "${libfile}.linkadd"; then
 				projlibextra="`cat "${libfile}.linkadd"`"
+
+				dnl Replace static linking requests with the appropriate values
+				if echo "${projlibextra}" | grep '^#STATIC ' >/dev/null; then
+					projlibextra_static="${projlibextra_static} `echo "${projlibextra}" | sed 's@^#STATIC @@'`"
+					projlibextra=''
+				fi
 			fi
 		done
 
 		AC_MSG_RESULT([${projlibfilesnostub} ${projlibextra}])
+
+		if [ -n "${projlibextra_static}" ]; then
+			DC_DO_STATIC_LINK_LIB([Additional libraries for ${proj}], ${projlibextra_static})
+		fi
 
 		hide_symbols="1"
 
 		if test "${proj}" = "tcl"; then
 			DC_TEST_WHOLE_ARCHIVE_SHARED_LIB([$ARCHS $projlibfilesnostub], [

Index: tls/build.sh
==================================================================
--- tls/build.sh
+++ tls/build.sh
@@ -132,11 +132,11 @@
 		fi
 
 		addlibs="${addlibs} ${KC_TLS_LINKADD}"
 
 		if [ "${KC_TLS_LINKSSLSTATIC}" = '1' ]; then
-			echo "-Wl,-Bstatic ${addlibs} ${addlibs_staticOnly} -Wl,-Bdynamic"
+			echo "#STATIC ${addlibs} ${addlibs_staticOnly}"
 		else
 			echo "${addlibs}"
 		fi > "${linkaddfile}"
 	fi
 }