diff --git a/tools/make_libdeps.sh b/tools/make_libdeps.sh
index f03f01edcca4..b0b3f186b1ac 100644
--- a/tools/make_libdeps.sh
+++ b/tools/make_libdeps.sh
@@ -47,9 +47,12 @@ sed -E
     -e's; ;! ;g'
     -e's;$;!;'
     -e's;-lbsdxml!;lib/libexpat;g'
+    -e's;-lpthread!;lib/libthr;g'
     -e's;-lm!;lib/msun;g'
-    -e's;-l(supc\+\+)!;gnu/lib/lib\1;g'
-    -e's;-l(asn1|krb5|roken)!;kerberos5/lib/lib\1;g'
+    -e's;-l(ncurses|termcap)!;lib/ncurses/ncurses;g'
+    -e's;-l(gcc)!;gnu/lib/lib\1;g'
+    -e's;-lssp_nonshared!;gnu/lib/libssp/libssp_nonshared;g'
+    -e's;-l(asn1|heimntlm|hx509|krb5|roken)!;kerberos5/lib/lib\1;g'
     -e's;-l(crypto|ssh|ssl)!;secure/lib/lib\1;g'
     -e's;-l([^!]+)!;lib/lib\1;g'
 "