diff --git a/devel/pccts/Makefile b/devel/pccts/Makefile
index fb6bbfc1b622..e4d8df763b64 100644
--- a/devel/pccts/Makefile
+++ b/devel/pccts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/01/20 12:13:29 agc Exp $
+# $NetBSD: Makefile,v 1.12 2004/04/16 21:27:22 snj Exp $
 #
 
 DISTNAME=	pccts133mr22
@@ -17,6 +17,8 @@ DIST_SUBDIR=	${PKGNAME}
 MAKEFILE=	makefile
 ALL_TARGET=
 
+USE_BUILDLINK3=	yes
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/antlr ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/dlg ${PREFIX}/bin
diff --git a/devel/pccts/buildlink3.mk b/devel/pccts/buildlink3.mk
new file mode 100644
index 000000000000..6e783d9d975f
--- /dev/null
+++ b/devel/pccts/buildlink3.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/16 21:27:22 snj Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+PCCTS_BUILDLINK3_MK:=	${PCCTS_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	pccts
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npccts}
+BUILDLINK_PACKAGES+=	pccts
+
+.if !empty(PCCTS_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.pccts+=	pccts>=1.33.22
+BUILDLINK_PKGSRCDIR.pccts?=	../../devel/pccts
+BUILDLINK_DEPMETHOD.pccts?=	build
+.endif	# PCCTS_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile
index f15f8ac54907..e3244cec6be3 100644
--- a/sysutils/cdrdao/Makefile
+++ b/sysutils/cdrdao/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/02/04 22:23:47 abs Exp $
+# $NetBSD: Makefile,v 1.15 2004/04/16 21:27:36 snj Exp $
 #
 
 DISTNAME=		${PKGNAME}.src
@@ -24,7 +24,7 @@ LDFLAGS+=		-L../paranoia
 #override ARCH to avoid picking up a bad ${ARCH} during the build
 MAKE_ENV+=      ARCH=""
 
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 
 post-configure:
 	cd ${WRKSRC}/scsilib/RULES ; \
@@ -62,5 +62,5 @@ post-install:
 		${INSTALL_MAN} ${WRKSRC}/contrib/wav2dao/wav2dao.pl \
 			${PREFIX}/share/examples/cdrdao
 
-.include "../../devel/pccts/buildlink2.mk"
+.include "../../devel/pccts/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"