diff --git a/www/rt40/Makefile b/www/rt40/Makefile
index 69306779d196..98f1a79553d7 100644
--- a/www/rt40/Makefile
+++ b/www/rt40/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	rt
-PORTVERSION=	4.0.20
-PORTREVISION=	2
+PORTVERSION=	4.0.21
 CATEGORIES=	www
 MASTER_SITES=	http://download.bestpractical.com/pub/rt/release/ \
 		SF/requesttracker/
diff --git a/www/rt40/Makefile.cpan b/www/rt40/Makefile.cpan
index 7bc7327980b2..765f3d939bc8 100644
--- a/www/rt40/Makefile.cpan
+++ b/www/rt40/Makefile.cpan
@@ -86,7 +86,6 @@ CLI_DEPS=	p5-HTTP-Message>0:${PORTSDIR}/www/p5-HTTP-Message \
 # ports to add:
 # Test::Email
 # Test::Builder >= 0.90
-# Plack::Middleware::Test::StashWarnings
 DEV_DEPS=	p5-Email-Abstract>0:${PORTSDIR}/mail/p5-Email-Abstract \
 		p5-HTML-Form>0:${PORTSDIR}/www/p5-HTML-Form \
 		p5-HTML-Parser>0:${PORTSDIR}/www/p5-HTML-Parser \
@@ -101,6 +100,7 @@ DEV_DEPS=	p5-Email-Abstract>0:${PORTSDIR}/mail/p5-Email-Abstract \
 		p5-Test-WWW-Mechanize>=1.30:${PORTSDIR}/devel/p5-Test-WWW-Mechanize \
 		p5-Test-Warn>0:${PORTSDIR}devel/p5-Test-Warn \
 		p5-WWW-Mechanize>=1.52:${PORTSDIR}/www/p5-WWW-Mechanize \
+		p5-Plack-Middleware-Test-StashWarnings>=0.08:${PORTSDIR}/www/p5-Plack-Middleware-Test-StashWarnings     \
 		p5-XML-Simple>0:${PORTSDIR}/textproc/p5-XML-Simple
 
 FASTCGI_DEPS=	p5-FCGI-ProcManager>0:${PORTSDIR}/www/p5-FCGI-ProcManager \
@@ -113,7 +113,7 @@ MYSQL_DEPS=	p5-DBD-mysql>=2.1018:${PORTSDIR}/databases/p5-DBD-mysql
 
 ORACLE_DEPS=	p5-DBD-Oracle>0:${PORTSDIR}/databases/p5-DBD-Oracle
 
-PGSQL_DEPS=	p5-DBD-Pg>=1.43:${PORTSDIR}/databases/p5-DBD-Pg
+PGSQL_DEPS=	p5-DBD-Pg32=3.2.1:${PORTSDIR}/databases/p5-DBD-Pg32
 
 SQLITE_DEPS=	p5-DBD-SQLite>=1.00:${PORTSDIR}/databases/p5-DBD-SQLite
 
diff --git a/www/rt40/distinfo b/www/rt40/distinfo
index 695a5696d77e..2aba2d6c9710 100644
--- a/www/rt40/distinfo
+++ b/www/rt40/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rt-4.0.20.tar.gz) = b05934e47b38abb57449d4cdde4d1721923f50a9fb9aab29c2d701a3d08c8ed7
-SIZE (rt-4.0.20.tar.gz) = 6944548
+SHA256 (rt-4.0.21.tar.gz) = f3a567a43a7c4bd85a1f63427ba92336ca6c0c0fb1053baa61195e338308a48a
+SIZE (rt-4.0.21.tar.gz) = 6944530
diff --git a/www/rt40/pkg-plist b/www/rt40/pkg-plist
index ecc2c75f00f0..cae49345b00e 100644
--- a/www/rt40/pkg-plist
+++ b/www/rt40/pkg-plist
@@ -247,6 +247,7 @@ sbin/standalone_httpd
 %%PORTDOCS%%%%DOCSDIR%%/customizing/approvals.pod
 %%PORTDOCS%%%%DOCSDIR%%/customizing/articles_introduction.pod
 %%PORTDOCS%%%%DOCSDIR%%/customizing/lifecycles.pod
+%%PORTDOCS%%%%DOCSDIR%%/customizing/search_result_columns.pod
 %%PORTDOCS%%%%DOCSDIR%%/customizing/styling_rt.pod
 %%PORTDOCS%%%%DOCSDIR%%/customizing/templates.pod
 %%PORTDOCS%%%%DOCSDIR%%/customizing/timezones_in_charts.pod