diff --git a/lib/libtermcap/Makefile b/lib/libtermcap/Makefile
index fbfa7f5c008..4fef3a1f0db 100644
--- a/lib/libtermcap/Makefile
+++ b/lib/libtermcap/Makefile
@@ -9,8 +9,8 @@ MLINKS=	termcap.3 tgetent.3 termcap.3 tgetflag.3 termcap.3 tgetnum.3 \
 	termcap.3 tgetstr.3 termcap.3 tgoto.3 termcap.3 tputs.3
 LINKS=	${LIBDIR}/libtermcap.a ${LIBDIR}/libtermlib.a
 .if !defined(NOPIC)
-LINKS+= ${SHLIBDIR}/libtermcap.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
-	${SHLIBDIR}/libtermlib.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
+LINKS+= ${LIBDIR}/libtermcap.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
+	${LIBDIR}/libtermlib.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
 .endif
 .if !defined(NOPROFILE)
 LINKS+=	${LIBDIR}/libtermcap_p.a ${LIBDIR}/libtermlib_p.a
diff --git a/lib/libtermcap/termcap.c b/lib/libtermcap/termcap.c
index 708ccfaa5d8..51f0288d580 100644
--- a/lib/libtermcap/termcap.c
+++ b/lib/libtermcap/termcap.c
@@ -78,6 +78,7 @@ tgetent(bp, name)
 	char **pvec;			/* holds usable tail of path vector */
 	char  *termpath;
 
+	dummy = NULL;
 	fname = pathvec;
 	pvec = pathvec;
 	tbuf = bp;