diff --git a/security/logcheck/Makefile b/security/logcheck/Makefile
index 29c5331041a4..677ef41f19cf 100644
--- a/security/logcheck/Makefile
+++ b/security/logcheck/Makefile
@@ -7,20 +7,16 @@
 
 PORTNAME=	logcheck
 PORTVERSION=	1.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
-MASTER_SITES=	ftp://sensimilia.eu.org/pub/software/sys/ \
-		http://www.ukc.mirror.ac.uk/sites/ftp.freebsd.org/pub/FreeBSD/ports/distfiles/ \
-		http://people.FreeBSD.org/~foxfair/distfiles/
-DISTNAME=	logsentry-${PORTVERSION}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	sentrytools
 
 MAINTAINER=	sergei@kolobov.com
 COMMENT=	Auditing tool for system logs on Unix boxes
 
 USE_REINPLACE=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 # Install binaries and config files readable to root only
 BINMODE=	700
 SHAREMODE=	600
@@ -43,10 +39,8 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/logtail ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/systems/freebsd/logcheck.sh ${PREFIX}/etc
 	@${MKDIR} ${EXAMPLESDIR}
-.for file in ${CONFIG_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/systems/freebsd/${file} ${EXAMPLESDIR}
-	@${TEST} -f ${PREFIX}/etc/${file} || \
-	  ${INSTALL_DATA} ${WRKSRC}/systems/freebsd/${file} ${PREFIX}/etc
+.for f in ${CONFIG_FILES}
+	@${INSTALL_DATA} ${WRKSRC}/systems/freebsd/${f} ${PREFIX}/etc/${f}.sample
 .endfor
 	${TEST} -d ${LOGCHECK_TMP} || ${MKDIR} -m 700 ${LOGCHECK_TMP}
 	${CHOWN} root:wheel ${LOGCHECK_TMP}
diff --git a/security/logcheck/distinfo b/security/logcheck/distinfo
index 7bd341cd539c..724e3b6aad21 100644
--- a/security/logcheck/distinfo
+++ b/security/logcheck/distinfo
@@ -1 +1 @@
-MD5 (logsentry-1.1.1.tar.gz) = e97c2f096e219e20310c1b80e9e1bc29
+MD5 (logcheck-1.1.1.tar.gz) = e97c2f096e219e20310c1b80e9e1bc29
diff --git a/security/logcheck/pkg-plist b/security/logcheck/pkg-plist
index 7e4b64100ab6..eda2bdbc0645 100644
--- a/security/logcheck/pkg-plist
+++ b/security/logcheck/pkg-plist
@@ -1,20 +1,15 @@
+@comment $FreeBSD$
 bin/logtail
+@exec test -d %%LOGCHECK_TMP%% || mkdir -m 700 %%LOGCHECK_TMP%% && chown root:wheel %%LOGCHECK_TMP%%
+@unexec rmdir %%LOGCHECK_TMP%% 2>/dev/null || true
+etc/logcheck.hacking.sample
+etc/logcheck.ignore.sample
 etc/logcheck.sh
-%%EXAMPLESDIR%%/logcheck.hacking
-@exec test -f %D/etc/%f || cp %D/%f %D/etc
-%%EXAMPLESDIR%%/logcheck.ignore
-@exec test -f %D/etc/%f || cp %D/%f %D/etc
-%%EXAMPLESDIR%%/logcheck.violations.ignore
-@exec test -f %D/etc/%f || cp %D/%f %D/etc
-%%EXAMPLESDIR%%/logcheck.violations
-@exec test -f %D/etc/%f || cp %D/%f %D/etc
-@dirrm %%EXAMPLESDIR%%
+etc/logcheck.violations.ignore.sample
+etc/logcheck.violations.sample
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.how.to.interpret
 %%PORTDOCS%%%%DOCSDIR%%/README.keywords
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@cwd /
-@exec test -d %%LOGCHECK_TMP%% || mkdir -m 700 %%LOGCHECK_TMP%% && chown root:wheel %%LOGCHECK_TMP%%
-@unexec rmdir %%LOGCHECK_TMP%% 2>/dev/null || true