diff --git a/devel/cdecl/Makefile b/devel/cdecl/Makefile
index 8426e893660b..8e4093ce2fde 100644
--- a/devel/cdecl/Makefile
+++ b/devel/cdecl/Makefile
@@ -9,8 +9,8 @@
 PORTNAME=	cdecl
 PORTVERSION=	2.5
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.netsw.org/softeng/lang/c/tools/cdecl/ \
-		ftp://metalab.unc.edu/pub/linux/devel/lang/c/
+MASTER_SITES=	${MASTER_SITE_SUNSITE}
+MASTER_SITE_SUBDIR=	devel/lang/c
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Explains complicated C/C++ declarations in plain English
@@ -18,6 +18,8 @@ COMMENT=	Explains complicated C/C++ declarations in plain English
 ALL_TARGET=	${PORTNAME}
 MAN1=		cdecl.1
 MLINKS=		cdecl.1 c++decl.1
+PORTDOCS=	testset testset++
+PLIST_FILES=	bin/cdecl bin/c++decl
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/devel/cdecl/pkg-plist b/devel/cdecl/pkg-plist
deleted file mode 100644
index bac6e279cb2f..000000000000
--- a/devel/cdecl/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $FreeBSD$
-bin/cdecl
-bin/c++decl
-%%PORTDOCS%%share/doc/cdecl/testset
-%%PORTDOCS%%share/doc/cdecl/testset++
-%%PORTDOCS%%@dirrm share/doc/cdecl