diff --git a/ftp/vsftpd/Makefile b/ftp/vsftpd/Makefile
index 757099f86f5c..d34e8f37d008 100644
--- a/ftp/vsftpd/Makefile
+++ b/ftp/vsftpd/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	vsftpd
-PORTVERSION=	1.0.1
+PORTVERSION=	1.1.0
 CATEGORIES=	ftp
-MASTER_SITES=	ftp://ferret.lmh.ox.ac.uk/pub/linux/
+MASTER_SITES=	ftp://vsftpd.beasts.org/users/cevans/
 
 MAINTAINER=	nbm@FreeBSD.org
 
@@ -21,7 +21,7 @@ MAN8=		vsftpd.8
 post-patch:
 	@${PERL} -pi -e 's@/etc/vsftpd.conf@${PREFIX}/etc/vsftpd.conf@' \
 		${WRKSRC}/defs.h
-	@${PERL} -pi -e 's@ -ldl@@; s@^CFLAGS.*$$@@' ${WRKSRC}/Makefile
+	@${PERL} -pi -e 's@ -ldl@@; s@^CFLAGS.*$$@CFLAGS= -D"atoll(x)=strtol(x, (char **)NULL, 10)"@' ${WRKSRC}/Makefile
 	@${ECHO_CMD} "secure_chroot_dir=${PREFIX}/share/vsftpd/empty" >> \
 		${WRKSRC}/vsftpd.conf
 
diff --git a/ftp/vsftpd/distinfo b/ftp/vsftpd/distinfo
index 7c662c9c0d3e..322e3e025c25 100644
--- a/ftp/vsftpd/distinfo
+++ b/ftp/vsftpd/distinfo
@@ -1 +1 @@
-MD5 (vsftpd-1.0.1.tar.gz) = a30724a5e56091164f538bbdce10cdf4
+MD5 (vsftpd-1.1.0.tar.gz) = b76403e4b366dc4c2344040f5e3fe137