diff --git a/security/clamav-devel/Makefile b/security/clamav-devel/Makefile
index c4dc23274956..5dbb545ea2cf 100644
--- a/security/clamav-devel/Makefile
+++ b/security/clamav-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	clamav
-PORTVERSION=	20040126
+PORTVERSION=	20040129
 CATEGORIES=	security
 MASTER_SITES=	http://clamav.sourceforge.net/snapshot/
 PKGNAMESUFFIX=	-devel
@@ -121,20 +121,21 @@ pre-install:
 		${SH} ${PKGINSTALL} ${PREFIX} PRE-INSTALL
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}${PKGNAMESUFFIX}
-	${INSTALL_DATA} ${WRKSRC}/docs/*pdf ${DOCSDIR}${PKGNAMESUFFIX}
+	@${INSTALL_DATA} ${WRKSRC}/docs/*pdf ${DOCSDIR}${PKGNAMESUFFIX}
 .endif
 
 post-install:
 	@[ -f ${PREFIX}/etc/clamav.conf ] || \
-		${CP} ${PREFIX}/etc/clamav.conf.default \
+		${CP} ${BUILD_WRKSRC}/etc/clamav.conf.default \
 			${PREFIX}/etc/clamav.conf
 	@[ -f ${PREFIX}/etc/freshclam.conf ] || \
-		${CP} ${PREFIX}/etc/freshclam.conf.default \
+		${CP} ${BUILD_WRKSRC}/etc/freshclam.conf.default \
 			${PREFIX}/etc/freshclam.conf
 	@${CHOWN} -R ${CLAMAVUSER}:${CLAMAVGROUP} ${DATADIR}
 	@${INSTALL_SCRIPT} ${WRKDIR}/clamav-clamd.sh \
 		${RC_DIR}/clamav-clamd${RC_SUFX}
 	@${INSTALL_SCRIPT} ${WRKDIR}/freshclam.sh ${RC_DIR}/freshclam${RC_SUFX}
+	@${SH} ${PKGINSTALL} ${PREFIX} POST-INSTALL
 .if defined(WITH_MILTER)
 	@${INSTALL_SCRIPT} ${WRKDIR}/clamav-milter.sh \
 		${RC_DIR}/clamav-milter${RC_SUFX}
diff --git a/security/clamav-devel/distinfo b/security/clamav-devel/distinfo
index afe423ce5160..fa613b1b309f 100644
--- a/security/clamav-devel/distinfo
+++ b/security/clamav-devel/distinfo
@@ -1 +1 @@
-MD5 (clamav-devel-20040126.tar.gz) = 71b7793bd733f59253c8e75419a49d4e
+MD5 (clamav-devel-20040129.tar.gz) = 8c0a73c2b832195b83edc163079285a4
diff --git a/security/clamav-devel/pkg-install b/security/clamav-devel/pkg-install
index 00d5592d5ef5..70a46257d425 100644
--- a/security/clamav-devel/pkg-install
+++ b/security/clamav-devel/pkg-install
@@ -45,7 +45,7 @@ fi
 
 if [ "$2" = "POST-INSTALL" ]; then
 	echo "===> Updating virus definitions..."
-	freshclam -u $3 --datadir=$4
+	freshclam
 fi
 
 exit 0