diff --git a/www/serendipity/Makefile b/www/serendipity/Makefile
index 27fc13ff07ec..d9094c1e109e 100644
--- a/www/serendipity/Makefile
+++ b/www/serendipity/Makefile
@@ -1,51 +1,55 @@
 # Created by: babak@farrokhi.net
 # $FreeBSD$
 
 PORTNAME=	serendipity
 PORTVERSION=	1.7.8
 PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	SF/php-blog/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PHP based weblog software
 
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/docs/LICENSE
+
 RUN_DEPENDS=	${LOCALBASE}/share/pear/File/Archive.php:${PORTSDIR}/archivers/pear-File_Archive
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	YES
 SERENDIPITY?=	www/${PORTNAME}
 #PLIST_SUB+=	SERENDIPITY=${SERENDIPITY}
 PLIST_SUB+=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 USE_PHP=	session pcre gd openssl mbstring iconv zlib xml
 #SUB_LIST+=	SERENDIPITY=${SERENDIPITY}
 SUB_FILES=	pkg-message
-USES=		tar:bzip2
+USES=		cpe tar:bzip2
+CPE_VENDOR=	s9y
 
 OPTIONS_DEFINE=	MYSQL PGSQL SQLITE MAGICK
 OPTIONS_DEFAULT=	MYSQL MAGICK
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMYSQL}
 USE_PHP+=	mysql
 . endif
 
 .if ${PORT_OPTIONS:MPGSQL}
 USE_PHP+=	pgsql
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE}
 USE_PHP+=	sqlite
 .endif
 
 .if ${PORT_OPTIONS:MMAGICK}
 RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
 .endif
 
 do-install:
 	@-${MKDIR} ${STAGEDIR}${PREFIX}/${SERENDIPITY}
 	@${CHMOD} 755 ${STAGEDIR}${PREFIX}/${SERENDIPITY}
 	@(cd ${WRKSRC} && ${CP} -R * ${STAGEDIR}${PREFIX}/${SERENDIPITY}/ )
 
 .include <bsd.port.mk>
diff --git a/www/serendipity/pkg-descr b/www/serendipity/pkg-descr
index 989afcc2f8c8..cddaf8da3685 100644
--- a/www/serendipity/pkg-descr
+++ b/www/serendipity/pkg-descr
@@ -1,4 +1,4 @@
 Serendipity is a weblog/blog system, implemented with PHP. 
 It is standards compliant, feature rich and open source (BSD License).
 
-WWW: http://www.s9y.org
+WWW: http://www.s9y.org/