diff --git a/www/tomcat-native/Makefile b/www/tomcat-native/Makefile
index 9a438b53b081..af1c8414cc01 100644
--- a/www/tomcat-native/Makefile
+++ b/www/tomcat-native/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	tomcat-native
-PORTVERSION=	1.1.16
+PORTVERSION=	1.1.18
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR=	tomcat/tomcat-connectors/native
+MASTER_SITE_SUBDIR=	tomcat/tomcat-connectors/native/${PORTVERSION}/source
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	ale@FreeBSD.org
diff --git a/www/tomcat-native/distinfo b/www/tomcat-native/distinfo
index 85c26271a6ac..dcd388c1ca78 100644
--- a/www/tomcat-native/distinfo
+++ b/www/tomcat-native/distinfo
@@ -1,3 +1,3 @@
-MD5 (tomcat-native-1.1.16-src.tar.gz) = 2d27f8cf0d87b92b57b2758dad48ff2d
-SHA256 (tomcat-native-1.1.16-src.tar.gz) = e0996844d391292f6697eb94f76ba44089c9e3c2f77f92493bbd30ccfb245719
-SIZE (tomcat-native-1.1.16-src.tar.gz) = 240128
+MD5 (tomcat-native-1.1.18-src.tar.gz) = 03701be390f81198ca4531ab4b0a8f35
+SHA256 (tomcat-native-1.1.18-src.tar.gz) = 80b61b847b266b75fb5d59143f4505468c998a36d5ef3449d108acfe2607253e
+SIZE (tomcat-native-1.1.18-src.tar.gz) = 241951