diff --git a/security/bugs/Makefile b/security/bugs/Makefile
index e9c1c98d8b04..2349c3bdfcdb 100644
--- a/security/bugs/Makefile
+++ b/security/bugs/Makefile
@@ -9,23 +9,20 @@ PORTNAME=	bugs
 PORTVERSION=	4.1.1
 PORTREVISION=	2
 CATEGORIES=	security
-MASTER_SITES=	http://www.encryptsolutions.com/english/download/
+MASTER_SITES=	SUNSITE/apps/crypto
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Great cryptography library and sample programs
 
-BROKEN=	Does not fetch
-
-PLIST_SUB+=	PORTVERSION=${PORTVERSION}
-DOCSDIR=	${PREFIX}/${DISTNAME}/doc
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_GMAKE=	yes
 
-# No Manual page
+PLIST_SUB=	PORTVERSION="${PORTVERSION}"
 
-post-extract:
-	${FIND} ${WRKSRC} -type d -exec ${CHMOD} +x {} \;
+DOCSDIR=	${PREFIX}/${DISTNAME}/doc
 
 post-configure:
 	(cd ${WRKSRC}; ${MAKE} bsd);
@@ -36,25 +33,19 @@ post-configure:
 	${REINPLACE_CMD} -e 's+\(@cp -rf ./doc/.*\)+# \1+' ${WRKSRC}/Makefile;
 
 post-build:
-	${CP} ${WRKSRC}/lib/unix/*.a ${WRKSRC}/lib/
+	@${LN} -sf ${WRKSRC}/lib/unix/*.a ${WRKSRC}/lib/
 
 pre-install:
 	(cd ${WRKSRC}; ${MAKE} test)
 
 post-install:
+	@${MKDIR} ${PREFIX}/${DISTNAME}/include
+	${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/${DISTNAME}/include
+.for file in bchat bcrypt bhide bkey block blogin bmore bpass bpassdel bunlock
+	@${STRIP_CMD} ${PREFIX}/${DISTNAME}/${file}
+.endfor
 .if !defined(NOPORTDOCS)
-	${CP} -R ${WRKSRC}/doc ${DOCSDIR}
+	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${DOCSDIR})
 .endif
-	${CP} -R ${WRKSRC}/include ${PREFIX}/${DISTNAME}
-	${STRIP_CMD} ${PREFIX}/${DISTNAME}/bchat \
-		${PREFIX}/${DISTNAME}/bcrypt \
-		${PREFIX}/${DISTNAME}/bhide \
-		${PREFIX}/${DISTNAME}/bkey \
-		${PREFIX}/${DISTNAME}/block \
-		${PREFIX}/${DISTNAME}/blogin \
-		${PREFIX}/${DISTNAME}/bmore \
-		${PREFIX}/${DISTNAME}/bpass \
-		${PREFIX}/${DISTNAME}/bpassdel \
-		${PREFIX}/${DISTNAME}/bunlock \
 
 .include <bsd.port.mk>
diff --git a/security/bugs/pkg-plist b/security/bugs/pkg-plist
index ae2d837f0481..bc24550753c8 100644
--- a/security/bugs/pkg-plist
+++ b/security/bugs/pkg-plist
@@ -7,12 +7,21 @@ bugs-%%PORTVERSION%%/blogin
 bugs-%%PORTVERSION%%/bmore
 bugs-%%PORTVERSION%%/bpass
 bugs-%%PORTVERSION%%/bpassdel
-bugs-%%PORTVERSION%%/bunlock
 bugs-%%PORTVERSION%%/bugscrypt.a
+bugs-%%PORTVERSION%%/bunlock
+bugs-%%PORTVERSION%%/include/bstandard.h
+bugs-%%PORTVERSION%%/include/extra.h
+bugs-%%PORTVERSION%%/include/fpos_t.h
+bugs-%%PORTVERSION%%/include/isaac.h
+bugs-%%PORTVERSION%%/include/main.h
+bugs-%%PORTVERSION%%/include/misc.h
+bugs-%%PORTVERSION%%/include/seed.h
+bugs-%%PORTVERSION%%/include/shuffle.h
+bugs-%%PORTVERSION%%/include/utils.h
+bugs-%%PORTVERSION%%/include/wrapper.h
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/HOWTO
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/cv/cv.html
 %%PORTDOCS%%%%DOCSDIR%%/cv/note.html
 %%PORTDOCS%%%%DOCSDIR%%/fulldoc/bssl.txt
@@ -28,8 +37,6 @@ bugs-%%PORTVERSION%%/bugscrypt.a
 %%PORTDOCS%%%%DOCSDIR%%/fulldoc/dev_french.txt
 %%PORTDOCS%%%%DOCSDIR%%/fulldoc/history_unix.txt
 %%PORTDOCS%%%%DOCSDIR%%/fulldoc/history_win.txt
-%%PORTDOCS%%%%DOCSDIR%%/fulldoc/index.html
-%%PORTDOCS%%%%DOCSDIR%%/fulldoc/lib_hist.txt
 %%PORTDOCS%%%%DOCSDIR%%/fulldoc/images/2_1.gif
 %%PORTDOCS%%%%DOCSDIR%%/fulldoc/images/2_2.gif
 %%PORTDOCS%%%%DOCSDIR%%/fulldoc/images/2_3.gif
@@ -44,21 +51,14 @@ bugs-%%PORTVERSION%%/bugscrypt.a
 %%PORTDOCS%%%%DOCSDIR%%/fulldoc/images/3_7.gif
 %%PORTDOCS%%%%DOCSDIR%%/fulldoc/images/3_8.gif
 %%PORTDOCS%%%%DOCSDIR%%/fulldoc/images/3_9.gif
+%%PORTDOCS%%%%DOCSDIR%%/fulldoc/index.html
+%%PORTDOCS%%%%DOCSDIR%%/fulldoc/lib_hist.txt
 %%PORTDOCS%%%%DOCSDIR%%/history/old_french.txt
-bugs-%%PORTVERSION%%/include/bstandard.h
-bugs-%%PORTVERSION%%/include/extra.h
-bugs-%%PORTVERSION%%/include/fpos_t.h
-bugs-%%PORTVERSION%%/include/isaac.h
-bugs-%%PORTVERSION%%/include/main.h
-bugs-%%PORTVERSION%%/include/misc.h
-bugs-%%PORTVERSION%%/include/seed.h
-bugs-%%PORTVERSION%%/include/shuffle.h
-bugs-%%PORTVERSION%%/include/utils.h
-bugs-%%PORTVERSION%%/include/wrapper.h
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/fulldoc/images/
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/fulldoc/
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/cv
+%%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/history
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/fulldoc/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/fulldoc
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/cv
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm bugs-%%PORTVERSION%%/include
 @dirrm bugs-%%PORTVERSION%%