diff --git a/www/mod_rivet/Makefile b/www/mod_rivet/Makefile
index 4eb50419727b..fde506a523c0 100644
--- a/www/mod_rivet/Makefile
+++ b/www/mod_rivet/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mod_rivet
-PORTVERSION=	2.1.4
-PORTREVISION=	1
+PORTVERSION=	2.2.0
 CATEGORIES=	www tcl
 MASTER_SITES=		${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	tcl/rivet
@@ -17,10 +16,9 @@ LICENSE=	APACHE20
 LIB_DEPENDS=	libitcl.so:${PORTSDIR}/lang/itcl
 
 USE_APACHE=	22+
-USE_AUTOTOOLS=	aclocal automake libtool libtoolize
-USE_AUTOTOOLS=	aclocal libtool libtoolize autoheader automake autoconf
+USE_AUTOTOOLS=	aclocal libtoolize autoheader automake autoconf
 USE_LDCONFIG=	${PREFIX}/lib/rivet
-USES+=		gmake tcl:85+
+USES+=		gmake libtool tcl:85+
 
 INSTALL_TARGET=	install
 
diff --git a/www/mod_rivet/distinfo b/www/mod_rivet/distinfo
index 12f923526fc7..1841e43cb352 100644
--- a/www/mod_rivet/distinfo
+++ b/www/mod_rivet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rivet-2.1.4.tar.gz) = 79936db37b97187cb82c7529799b23d105fae41be5072bd044f63accc6a3ea74
-SIZE (rivet-2.1.4.tar.gz) = 1384469
+SHA256 (rivet-2.2.0.tar.gz) = 80b04505aeab8928bfacf63d2b9af1fd3ef17b07df54bb5c299ab95eed00814a
+SIZE (rivet-2.2.0.tar.gz) = 1247211
diff --git a/www/mod_rivet/pkg-plist b/www/mod_rivet/pkg-plist
index bb003b9b9e0a..48a7e9b4fdf0 100644
--- a/www/mod_rivet/pkg-plist
+++ b/www/mod_rivet/pkg-plist
@@ -70,3 +70,4 @@ lib/rivet/rivet-tcl/xml.tcl
 @dirrm lib/rivet/packages/calendar
 @dirrm lib/rivet/packages
 @dirrm lib/rivet
+@dirrmtry %%APACHEMODDIR%%