diff --git a/ftp/lftp/Makefile b/ftp/lftp/Makefile
index 550d6fc75913..24c50a06b337 100644
--- a/ftp/lftp/Makefile
+++ b/ftp/lftp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	lftp
-PORTVERSION=	2.6.12
+PORTVERSION=	3.0.1
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	ftp://ftp.phear.org/pub/linux/networking/ftp/client/lftp/ \
 		ftp://ftp.phear.org/pub/linux/networking/ftp/client/lftp/old/ \
diff --git a/ftp/lftp/distinfo b/ftp/lftp/distinfo
index 9846c0cfcf07..2c2bec6c8f31 100644
--- a/ftp/lftp/distinfo
+++ b/ftp/lftp/distinfo
@@ -1,10 +1,4 @@
-MD5 (lftp-2.6.12.tar.bz2) = bc5ed223daa568fda9a01f89b5000612
-SHA1 (lftp-2.6.12.tar.bz2) = 96b399211a4008ae96f7c1ce44756632250d154e
-RMD160 (lftp-2.6.12.tar.bz2) = dbb989cd02f5a3be54e1e89dbc8ad68bc15246b4
-SHA256 (lftp-2.6.12.tar.bz2) = 8a04f0ab1fd9d6b7e4378d1f7f3d95d13cba09e41860f49bfad599eddd9f4ad4
-SIZE (lftp-2.6.12.tar.bz2) = 1188316
-MD5 (lftp-2.6.12.tar.bz2.asc) = a2ea8dc91f9373b2bf46626d861a2d92
-SHA1 (lftp-2.6.12.tar.bz2.asc) = 84c2b44a548783a3eabcdcbd6b302eb2c35d47b7
-RMD160 (lftp-2.6.12.tar.bz2.asc) = e4c111eee39bf39df2cb1e5afd332c72d79efbba
-SHA256 (lftp-2.6.12.tar.bz2.asc) = 6a9dd1507808c8293ea8bea6a5a817806afde1431dbc089eb4dddac217e3f14b
-SIZE (lftp-2.6.12.tar.bz2.asc) = 185
+MD5 (lftp-3.0.1.tar.bz2) = 1417136e92a01218b9500615ee6855c6
+SIZE (lftp-3.0.1.tar.bz2) = 1213419
+MD5 (lftp-3.0.1.tar.bz2.asc) = 1fea768039f41df33a14475487801bf5
+SIZE (lftp-3.0.1.tar.bz2.asc) = 185
diff --git a/ftp/lftp/files/patch-src::FtpListInfo.cc b/ftp/lftp/files/patch-src::FtpListInfo.cc
new file mode 100644
index 000000000000..fd877dffeca5
--- /dev/null
+++ b/ftp/lftp/files/patch-src::FtpListInfo.cc
@@ -0,0 +1,11 @@
+--- src/FtpListInfo.cc.orig	Thu Apr  8 23:53:22 2004
++++ src/FtpListInfo.cc	Thu Apr  8 23:53:35 2004
+@@ -788,7 +788,7 @@
+       }
+       if(!strncasecmp(tok,"Size=",5))
+       {
+-	 size=atoll(tok+5);
++	 size=strtoll(tok+5, NULL, 10);
+ 	 continue;
+       }
+       if(!strncasecmp(tok,"Perm=",5))