diff --git a/gnu/usr.bin/cvs/cvs/Makefile b/gnu/usr.bin/cvs/cvs/Makefile
index 047ae8cc3aa1..a578b466c749 100644
--- a/gnu/usr.bin/cvs/cvs/Makefile
+++ b/gnu/usr.bin/cvs/cvs/Makefile
@@ -3,7 +3,7 @@ CFLAGS +=	-I${.CURDIR}/../lib \
 		-DDIRENT -DSTDC_HEADERS -DPOSIX -DBROKEN_SIGISMEMBER \
 		-DFTIME_MISSING -DHAVE_TIMEZONE -DUTIME_NULL_MISSING -DDO_LINKS
 
-LDADD=  -L${.CURDIR}/../lib/obj -lcvs
+LDADD=  -L${.CURDIR}/../lib/${.CURDIR} -lcvs
 
 SRCS = add.c admin.c checkin.c checkout.c classify.c commit.c \
 create_adm.c diff.c entries.c find_names.c history.c ignore.c \
diff --git a/gnu/usr.bin/cvs/mkmodules/Makefile b/gnu/usr.bin/cvs/mkmodules/Makefile
index 9f66fdefc97f..23fe4589cfc0 100644
--- a/gnu/usr.bin/cvs/mkmodules/Makefile
+++ b/gnu/usr.bin/cvs/mkmodules/Makefile
@@ -2,7 +2,7 @@ PROG = mkmodules
 SRCS = mkmodules.c
 
 CFLAGS += -I${.CURDIR}/../cvs -I${.CURDIR}/../lib
-LDADD= -L${.CURDIR}/../lib/obj -lcvs
+LDADD= -L${.CURDIR}/../lib/${.CURDIR} -lcvs
 
 .include <bsd.prog.mk>
 .include "../../Makefile.inc"