diff --git a/ggatec/Makefile b/ggatec/Makefile
index 4d8917f..e228fea 100644
--- a/ggatec/Makefile
+++ b/ggatec/Makefile
@@ -10,7 +10,6 @@ CFLAGS+= -DMAX_SEND_SIZE=32768
 CFLAGS+= -DLIBGEOM
 CFLAGS+= -I${.CURDIR}/../shared
 
-DPADD=	${LIBGEOM} ${LIBSBUF} ${LIBBSDXML} ${LIBUTIL} ${LIBPTHREAD}
-LDADD=	-lgeom -lsbuf -lbsdxml -lutil -lpthread
+LIBADD=	geom util pthread
 
 .include <bsd.prog.mk>
diff --git a/ggated/Makefile b/ggated/Makefile
index 4e7708e..af5c9bd 100644
--- a/ggated/Makefile
+++ b/ggated/Makefile
@@ -6,8 +6,7 @@ PROG=	ggated
 MAN=	ggated.8
 SRCS=	ggated.c ggate.c
 
-DPADD=	${LIBPTHREAD}
-LDADD=	-lpthread
+LIBADD=	pthread
 
 CFLAGS+= -I${.CURDIR}/../shared
 
diff --git a/ggatel/Makefile b/ggatel/Makefile
index 604a754..be88bd4 100644
--- a/ggatel/Makefile
+++ b/ggatel/Makefile
@@ -9,7 +9,6 @@ SRCS=	ggatel.c ggate.c
 CFLAGS+= -DLIBGEOM
 CFLAGS+= -I${.CURDIR}/../shared
 
-DPADD=	${LIBGEOM} ${LIBSBUF} ${LIBBSDXML} ${LIBUTIL}
-LDADD=	-lgeom -lsbuf -lbsdxml -lutil
+LIBADD=	geom util
 
 .include <bsd.prog.mk>