diff --git a/www/mod_security/Makefile b/www/mod_security/Makefile
index 4f3300b0b187..32b79bce3aa8 100644
--- a/www/mod_security/Makefile
+++ b/www/mod_security/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	mod_security
-PORTVERSION=	2.5.7
-PORTREVISION=	1
+PORTVERSION=	2.5.9
 CATEGORIES=	www security
-MASTER_SITES=	http://www.modsecurity.org/download/
+MASTER_SITES=	SF
+MASTER_SITE_SUBDIR=	mod-security
 DISTNAME=	${PORTNAME:S/_//:S/2//}-apache_${PORTVERSION}
 
 MAINTAINER=	araujo@FreeBSD.org
diff --git a/www/mod_security/distinfo b/www/mod_security/distinfo
index 47a8c9893d84..29d064496486 100644
--- a/www/mod_security/distinfo
+++ b/www/mod_security/distinfo
@@ -1,3 +1,3 @@
-MD5 (modsecurity-apache_2.5.7.tar.gz) = 049509c4d76048ce02cfb558d6598761
-SHA256 (modsecurity-apache_2.5.7.tar.gz) = 581b81e39fe23bae75f460547b8d4c172ffaa54ff913ccf94b62cc56b4fb3d9a
-SIZE (modsecurity-apache_2.5.7.tar.gz) = 1117167
+MD5 (modsecurity-apache_2.5.9.tar.gz) = b7bf44a7e041b49b0da5043495660375
+SHA256 (modsecurity-apache_2.5.9.tar.gz) = 02352221ea268f8ae9aae5b84507f51eba2a67c0f7d2efd5cc88e85f1f394056
+SIZE (modsecurity-apache_2.5.9.tar.gz) = 1252295