diff --git a/security/hackbot/Makefile b/security/hackbot/Makefile
index 150c5f7f9744..c9ff8a3e37fd 100644
--- a/security/hackbot/Makefile
+++ b/security/hackbot/Makefile
@@ -1,36 +1,36 @@
 # New ports collection makefile for:   hackbot
 # Date created:        Mon Jan 13 15:44:35 GMT 2003
 # Whom:                mich@freebsdcluster.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=	hackbot
-PORTVERSION=	2.20
+PORTVERSION=	2.21
 CATEGORIES=	security
 MASTER_SITES=	http://ws.obit.nl/hackbot/
 EXTRACT_SUFX=   .tgz
 
 MAINTAINER=	mich@FreeBSD.org
 COMMENT=	A host exploration tool and bannergrabber
 
 USE_REINPLACE=	YES
 USE_PERL5=	YES
 NO_BUILD=	YES
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 pre-patch:
-	@${REINPLACE_CMD} -e 's|/usr/local/etc/|${PREFIX}/etc/hackbot/|' ${WRKSRC}/hackbot.pl
+	@${REINPLACE_CMD} -e 's|/usr/local/etc/|${DATADIR}/hackbot/|' ${WRKSRC}/hackbot.pl
 
 do-install:
-	${MKDIR} ${PREFIX}/etc/hackbot
-	${INSTALL_DATA} ${WRKSRC}/google.db ${PREFIX}/etc/hackbot/google.db
-	${INSTALL_DATA} ${WRKSRC}/fingerprint.db ${PREFIX}/etc/hackbot/fingerprint.db
-	${INSTALL_DATA} ${WRKSRC}/cgi.db ${PREFIX}/etc/hackbot/cgi.db
+	${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/google.db ${DATADIR}/google.db
+	${INSTALL_DATA} ${WRKSRC}/fingerprint.db ${DATADIR}/fingerprint.db
+	${INSTALL_DATA} ${WRKSRC}/cgi.db ${DATADIR}/cgi.db
 	${INSTALL_SCRIPT} ${WRKSRC}/hackbot.pl ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/hackbot.1.gz ${PREFIX}/man/man1/
 
 MAN1=	hackbot.1
 MANCOMPRESSED=	yes
 
 .include <bsd.port.mk>
diff --git a/security/hackbot/distinfo b/security/hackbot/distinfo
index d46b0a94686d..5f458deaa614 100644
--- a/security/hackbot/distinfo
+++ b/security/hackbot/distinfo
@@ -1 +1 @@
-MD5 (hackbot-2.20.tgz) = f9fecaa66aca09a249b26709867d4bc8
+MD5 (hackbot-2.21.tgz) = 011944285e4570b476e244cf2b9fc7b4
diff --git a/security/hackbot/pkg-plist b/security/hackbot/pkg-plist
index c0f0f6ed896c..656fe731b6c9 100644
--- a/security/hackbot/pkg-plist
+++ b/security/hackbot/pkg-plist
@@ -1,5 +1,5 @@
 bin/hackbot.pl
-etc/hackbot/google.db
-etc/hackbot/fingerprint.db
-etc/hackbot/cgi.db
-@dirrm etc/hackbot
+share/hackbot/google.db
+share/hackbot/fingerprint.db
+share/hackbot/cgi.db
+@dirrm share/hackbot