diff -ruN mod_security.orig/Makefile mod_security/Makefile
--- mod_security.orig/Makefile	Mon Oct 20 23:20:38 2003
+++ mod_security/Makefile	Mon Oct 20 23:29:01 2003
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	mod_security
-PORTVERSION=	1.5.1
+PORTVERSION=	1.7
 CATEGORIES=	www
-MASTER_SITES=	http://www.modsecurity.org/download/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME:S/_/-/}
 
 MAINTAINER=	sysadmin@alexdupre.com
 COMMENT=	An intrusion detection and prevention engine
@@ -35,7 +36,8 @@
 BUILD_DEPENDS+= ${APXS}:${APACHE_PORT}
 RUN_DEPENDS+=   ${APXS}:${APACHE_PORT}
 
-DOCS=		CHANGES INSTALL LICENSE README modsecurity-manual-v1.5.1.pdf
+DOCS=		CHANGES INSTALL LICENSE README modsecurity-manual-${PORTVERSION}.pdf
+PLIST_SUB+=	VER=${PORTVERSION}
 
 do-build:
 	@cd ${APWRKSRC} && ${APXS} -c mod_security.c
diff -ruN mod_security.orig/distinfo mod_security/distinfo
--- mod_security.orig/distinfo	Mon Oct 20 23:20:38 2003
+++ mod_security/distinfo	Mon Oct 20 23:23:52 2003
@@ -1 +1 @@
-MD5 (mod_security-1.5.1.tar.gz) = 05ef8cc89a1b4d291bf694b0d77a2f5b
+MD5 (mod_security-1.7.tar.gz) = c6b152d726c5383be4f112e294c19d03
diff -ruN mod_security.orig/pkg-plist mod_security/pkg-plist
--- mod_security.orig/pkg-plist	Mon Oct 20 23:20:38 2003
+++ mod_security/pkg-plist	Mon Oct 20 23:29:08 2003
@@ -1,12 +1,12 @@
 libexec/%%APACHE%%/mod_security.so
 @exec %D/sbin/apxs -e -a -n security %D/%F
 @unexec %D/sbin/apxs -e -A -n security %D/%F
-%%PORTDOCS%%share/doc/mod_security/CHANGES
-%%PORTDOCS%%share/doc/mod_security/INSTALL
-%%PORTDOCS%%share/doc/mod_security/LICENSE
-%%PORTDOCS%%share/doc/mod_security/README
-%%PORTDOCS%%share/doc/mod_security/modsecurity-manual-v1.5.1.pdf
-share/examples/mod_security/httpd.conf.example-full
-share/examples/mod_security/httpd.conf.example-minimal
-%%PORTDOCS%%@dirrm share/doc/mod_security
-@dirrm share/examples/mod_security
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/modsecurity-manual-%%VER%%.pdf
+%%EXAMPLESDIR%%/httpd.conf.example-full
+%%EXAMPLESDIR%%/httpd.conf.example-minimal
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%EXAMPLESDIR%%