diff --git a/ftp/lftp/Makefile b/ftp/lftp/Makefile
index 809cf0d817be..a3d38faa19ab 100644
--- a/ftp/lftp/Makefile
+++ b/ftp/lftp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	lftp
-PORTVERSION=	2.5.2
+PORTVERSION=	2.5.4
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	ftp://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/ \
 		ftp://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/old/ \
@@ -24,11 +24,27 @@ MAINTAINER=	fm@astral.ntu-kpi.kiev.ua
 LIB_DEPENDS=	intl.2:${PORTSDIR}/devel/gettext
 
 USE_BZIP2=	yes
+
+.if !defined(WITHOUT_SSL)
 USE_OPENSSL=	yes
+.else
+CONFIGURE_ARGS+=	--without-ssl
+.endif
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
+.if defined(WITH_SOCKS4)
+CONFIGURE_ARGS+=	--with-socks
+.endif
+.if defined(WITH_SOCKS5)
+CONFIGURE_ARGS+=	--with-socks5
+.endif
+.if defined(WITH_SOCKS_DANTE)
+CONFIGURE_ARGS+=	--with-socksdante
+.endif
+
 MAN1=		lftp.1
 
 post-install:
diff --git a/ftp/lftp/distinfo b/ftp/lftp/distinfo
index c9ab39388e6c..5fbc23a7a482 100644
--- a/ftp/lftp/distinfo
+++ b/ftp/lftp/distinfo
@@ -1 +1 @@
-MD5 (lftp-2.5.2.tar.bz2) = f3f1679f46c924e734e2a8eaf05a07ff
+MD5 (lftp-2.5.4.tar.bz2) = 94bff81a84bac8c9029b2f4f8262c1f0