diff --git a/Makefile b/Makefile
index b463359..c3a866c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,10 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
-
 SUBDIR=	${_ggatec} \
 	${_ggated} \
 	ggatel
 
-.if ${MK_LIBTHR} != "no"
 _ggatec=	ggatec
 _ggated=	ggated
-.endif
 
 .include <bsd.subdir.mk>
diff --git a/Makefile.inc b/Makefile.inc
deleted file mode 100644
index 265f86d..0000000
--- a/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $FreeBSD$
-
-.include "../Makefile.inc"
diff --git a/ggatec/Makefile b/ggatec/Makefile
index 0f4eb70..3bf75bb 100644
--- a/ggatec/Makefile
+++ b/ggatec/Makefile
@@ -10,6 +10,6 @@ CFLAGS+= -DMAX_SEND_SIZE=32768
 CFLAGS+= -DLIBGEOM
 CFLAGS+= -I${.CURDIR:H}/shared
 
-LIBADD=	geom util pthread
+LDADD=	-lgeom -lutil -lpthread
 
 .include <bsd.prog.mk>
diff --git a/ggated/Makefile b/ggated/Makefile
index c5a6131..db1749f 100644
--- a/ggated/Makefile
+++ b/ggated/Makefile
@@ -6,7 +6,7 @@ PROG=	ggated
 MAN=	ggated.8
 SRCS=	ggated.c ggate.c
 
-LIBADD=	pthread util
+LDADD=	-lpthread -lutil
 
 CFLAGS+= -I${.CURDIR:H}/shared
 
diff --git a/ggatel/Makefile b/ggatel/Makefile
index af58c73..85bfb36 100644
--- a/ggatel/Makefile
+++ b/ggatel/Makefile
@@ -9,6 +9,6 @@ SRCS=	ggatel.c ggate.c
 CFLAGS+= -DLIBGEOM
 CFLAGS+= -I${.CURDIR:H}/shared
 
-LIBADD=	geom util
+LDADD=	-lgeom -lutil
 
 .include <bsd.prog.mk>