diff --git a/www/tomcat7/Makefile b/www/tomcat7/Makefile
index eea63763a72b..f8e6a0847c17 100644
--- a/www/tomcat7/Makefile
+++ b/www/tomcat7/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tomcat
-PORTVERSION=	7.0.37
-PORTREVISION=	1
+PORTVERSION=	7.0.40
 CATEGORIES=	www java
 MASTER_SITES=	APACHE
 MASTER_SITE_SUBDIR=	tomcat/tomcat-7/v${PORTVERSION}/bin
@@ -68,10 +67,6 @@ do-install:
 .	endif
 .endfor
 
-	@${ECHO_MSG} -n ">> Creating symlink to tools.jar..."
-	@${LN} -sf ${JAVA_HOME}/lib/tools.jar ${TOMCAT_HOME}/lib/tools.jar
-	@${ECHO_MSG} " [ DONE ]"
-
 	@${ECHO_MSG} -n ">> Fixing ownership settings..."
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${TOMCAT_HOME}/conf ${TOMCAT_HOME}/logs \
 		${TOMCAT_HOME}/temp ${TOMCAT_HOME}/webapps ${TOMCAT_HOME}/work
diff --git a/www/tomcat7/distinfo b/www/tomcat7/distinfo
index c2ab5a511dc8..28444085ad78 100644
--- a/www/tomcat7/distinfo
+++ b/www/tomcat7/distinfo
@@ -1,2 +1,2 @@
-SHA256 (apache-tomcat-7.0.37.tar.gz) = 4955fc8ca6ee20886d078360f0f169c0490949556044d96542750428e814d9aa
-SIZE (apache-tomcat-7.0.37.tar.gz) = 7814288
+SHA256 (apache-tomcat-7.0.40.tar.gz) = 430a3eec73b6994dbbd6e17728f131fa3609bdd923547445a745d4ffb6d9cf01
+SIZE (apache-tomcat-7.0.40.tar.gz) = 7843733
diff --git a/www/tomcat7/pkg-plist b/www/tomcat7/pkg-plist
index 76c610711ec0..bc5b793da747 100644
--- a/www/tomcat7/pkg-plist
+++ b/www/tomcat7/pkg-plist
@@ -44,7 +44,7 @@
 %%T%%/lib/catalina-ha.jar
 %%T%%/lib/catalina-tribes.jar
 %%T%%/lib/catalina.jar
-%%T%%/lib/ecj-4.2.1.jar
+%%T%%/lib/ecj-4.2.2.jar
 %%T%%/lib/el-api.jar
 %%T%%/lib/jasper-el.jar
 %%T%%/lib/jasper.jar
@@ -58,7 +58,6 @@
 %%T%%/lib/tomcat-i18n-ja.jar
 %%T%%/lib/tomcat-jdbc.jar
 %%T%%/lib/tomcat-util.jar
-%%T%%/lib/tools.jar
 %%T%%/temp/safeToDelete.tmp
 %%T%%/webapps/ROOT/RELEASE-NOTES.txt
 %%T%%/webapps/ROOT/WEB-INF/web.xml