diff --git a/net-ftp/lftp/lftp-4.4.16.recipe b/net-ftp/lftp/lftp-4.4.16.recipe
deleted file mode 100644
index 16c8ca6dc..000000000
--- a/net-ftp/lftp/lftp-4.4.16.recipe
+++ /dev/null
@@ -1,99 +0,0 @@
-SUMMARY="A sophisticated file transfer program with command line interface"
-DESCRIPTION="lftp is sophisticated file transfer program with command line \
-interface. It supports FTP, HTTP, FISH, SFTP and FILE (local FS) protocols. \
-GNU Readline library is used for input. BitTorrent protocol is supported as \
-built-in torrent command.
-Low level stuff supported: ftp proxy, http proxy, ftp over http, opie/skey, \
-fxp transfers, automatic retrying on non-fatal errors and timeouts, ipv6, \
-socks, http/1.1, sftp v3-v6."
-HOMEPAGE="http://lftp.yar.ru"
-COPYRIGHT="1996-2012 Alexander V. Lukyanov"
-LICENSE="GNU GPL v3"
-REVISION="4"
-SOURCE_URI="http://lftp.yar.ru/ftp/lftp-$portVersion.tar.gz"
-CHECKSUM_SHA256="441f472f9d3f13b0861fbf3e45f5d08d8cf999d2229b4ee446815d52ad673bf2"
-PATCHES="lftp-$portVersion.patchset"
-
-ARCHITECTURES="!x86_gcc2 x86 x86_64 arm"
-SECONDARY_ARCHITECTURES="x86"
-
-GLOBAL_WRITABLE_FILES="
-	settings/lftp.conf keep-old
-	"
-
-PROVIDES="
-	lftp$secondaryArchSuffix = $portVersion
-	cmd:lftp = $portVersion compat >= 4
-	cmd:lftpget = $portVersion compat >= 4
-	lib:liblftp_jobs$secondaryArchSuffix = 0.0.0 compat >= 0
-	lib:liblftp_tasks$secondaryArchSuffix = 0.0.0 compat >= 0
-"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	ca_root_certificates
-	lib:libcrypto$secondaryArchSuffix
-	lib:libreadline$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	lftp${secondaryArchSuffix}_devel = $portVersion
-	devel:liblftp_jobs$secondaryArchSuffix = 0.0.0 compat >= 0
-	devel:liblftp_tasks$secondaryArchSuffix = 0.0.0 compat >= 0
-	"
-REQUIRES_devel="
-	lftp$secondaryArchSuffix == $portVersion base
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	devel:libcrypto$secondaryArchSuffix
-	devel:libreadline$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	cmd:aclocal
-	cmd:autoconf
-	cmd:automake
-	cmd:find
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:libtoolize
-	cmd:make
-	cmd:pkg_config
-	cmd:sed
-	"
-
-PATCH()
-{
-	sed -i configure.ac -e 's|^AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g'
-}
-
-BUILD()
-{
-	libtoolize --force --copy --install
-	aclocal -I m4
-	autoconf
-	automake
-	runConfigure --omit-dirs binDir ./configure --with-openssl --enable-static \
-		--bindir=$prefix/bin
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-
-	# prepare develop/lib
-	prepareInstalledDevelLibs liblftp-jobs liblftp-tasks
-	fixPkgconfig
-
-	# devel package
-	packageEntries devel \
-		$developDir
-}
-
-TEST()
-{
-	make check
-}
diff --git a/net-ftp/lftp/lftp-4.8.3.recipe b/net-ftp/lftp/lftp-4.8.4.recipe
similarity index 89%
rename from net-ftp/lftp/lftp-4.8.3.recipe
rename to net-ftp/lftp/lftp-4.8.4.recipe
index bc1c6477a..e6f9bdb6b 100644
--- a/net-ftp/lftp/lftp-4.8.3.recipe
+++ b/net-ftp/lftp/lftp-4.8.4.recipe
@@ -11,11 +11,11 @@ COPYRIGHT="1996-2017 Alexander V. Lukyanov"
 LICENSE="GNU GPL v3"
 REVISION="1"
 SOURCE_URI="http://lftp.yar.ru/ftp/lftp-$portVersion.tar.gz"
-CHECKSUM_SHA256="cfbbbd067c25ff9d629828a010cc700214859b02e33b2405dfe7ed045d080f0f"
+CHECKSUM_SHA256="19f3a4236558fbdb88eec01bc9d693c51b122d23487b6bedad4cc67ae6825fc2"
 PATCHES="lftp-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 ?x86 x86_64 ?arm"
-SECONDARY_ARCHITECTURES="?x86"
+SECONDARY_ARCHITECTURES="x86"
 
 GLOBAL_WRITABLE_FILES="
 	settings/lftp.conf keep-old
@@ -79,8 +79,9 @@ BUILD_PREREQUIRES="
 BUILD()
 {
 	autoreconf -vfi
-	CPPFLAGS=-I"$(finddir B_SYSTEM_HEADERS_DIRECTORY)$secondaryArchSubDir/readline" \
-	LIBS=-lreadline runConfigure ./configure --with-openssl --enable-static \
+	runConfigure ./configure --with-openssl --enable-static --with-readline \
+		--with-readline-lib=-lreadline \
+		--with-readline-inc="$(finddir B_SYSTEM_HEADERS_DIRECTORY)$secondaryArchSubDir/readline" \
 		--with-modules --disable-nls
 	make $jobArgs
 }
diff --git a/net-ftp/lftp/patches/lftp-4.8.3.patchset b/net-ftp/lftp/patches/lftp-4.8.3.patchset
deleted file mode 100644
index a2c5d76fb..000000000
--- a/net-ftp/lftp/patches/lftp-4.8.3.patchset
+++ /dev/null
@@ -1,22 +0,0 @@
-From 5ade774564ec60f247d60adbd39c2f94c6164fff Mon Sep 17 00:00:00 2001
-From: Jerome Duval <jerome.duval@gmail.com>
-Date: Sat, 17 May 2014 13:38:15 +0000
-Subject: gcc2 fix
-
-
-diff --git a/lib/gl_openssl.h b/lib/gl_openssl.h
-index 2414421..014769d 100644
---- a/lib/gl_openssl.h
-+++ b/lib/gl_openssl.h
-@@ -95,7 +95,7 @@ GL_CRYPTO_FN (_finish_ctx) (struct _gl_ctx *ctx, void *res)
- 
- GL_OPENSSL_INLINE void *
- GL_CRYPTO_FN (_buffer) (const char *buf, size_t len, void *res)
--{ return OPENSSL_FN () ((const unsigned char *) buf, len, (unsigned char *) res); }
-+{ return OPENSSL_FN ( ) ((const unsigned char *) buf, len, (unsigned char *) res); }
- 
- GL_OPENSSL_INLINE void *
- GL_CRYPTO_FN (_read_ctx) (const struct _gl_ctx *ctx, void *res)
--- 
-1.8.3.4
-
diff --git a/net-ftp/lftp/patches/lftp-4.4.16.patchset b/net-ftp/lftp/patches/lftp-4.8.4.patchset
similarity index 100%
rename from net-ftp/lftp/patches/lftp-4.4.16.patchset
rename to net-ftp/lftp/patches/lftp-4.8.4.patchset