diff --git a/ftp/lftp/Makefile b/ftp/lftp/Makefile
index b234533ecb27..de16d4c045cc 100644
--- a/ftp/lftp/Makefile
+++ b/ftp/lftp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	lftp
-PORTVERSION=	3.0.3
+PORTVERSION=	3.0.4
 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/ \
@@ -33,7 +33,7 @@ MASTER_SITES=	ftp://ftp.phear.org/pub/linux/networking/ftp/client/lftp/ \
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.asc
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER=	fm@code.org.ua
+MAINTAINER=	fm@cross-road.org.ua
 COMMENT=	Shell-like command line ftp client
 
 USE_BZIP2=	yes
diff --git a/ftp/lftp/distinfo b/ftp/lftp/distinfo
index 142e12b646e6..1e7fe42ada1f 100644
--- a/ftp/lftp/distinfo
+++ b/ftp/lftp/distinfo
@@ -1,4 +1,4 @@
-MD5 (lftp-3.0.3.tar.bz2) = ee346d91ecd280a8e7f6ea406ceed144
-SIZE (lftp-3.0.3.tar.bz2) = 1214354
-MD5 (lftp-3.0.3.tar.bz2.asc) = 06d64b86313dd2fcf759a411fd6d38ce
-SIZE (lftp-3.0.3.tar.bz2.asc) = 185
+MD5 (lftp-3.0.4.tar.bz2) = 382a08fed9f7396971996ad1ba12aefb
+SIZE (lftp-3.0.4.tar.bz2) = 1216429
+MD5 (lftp-3.0.4.tar.bz2.asc) = c197830690cef59d02656c9869f55af6
+SIZE (lftp-3.0.4.tar.bz2.asc) = 185
diff --git a/ftp/lftp/files/patch-ltmain.sh b/ftp/lftp/files/patch-ltmain.sh
index e71718a9f08e..e48070bce0b6 100644
--- a/ftp/lftp/files/patch-ltmain.sh
+++ b/ftp/lftp/files/patch-ltmain.sh
@@ -1,16 +1,6 @@
---- ltmain.sh.orig	Sat Sep 22 20:10:52 2001
-+++ ltmain.sh	Tue Nov 20 21:14:55 2001
-@@ -2444,6 +2444,9 @@
- 	  *-*-openbsd*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test $build_libtool_need_lc = "yes"; then
-@@ -4210,10 +4213,12 @@
+--- ltmain.sh.orig	Fri May 23 15:22:56 2003
++++ ltmain.sh	Thu May 27 12:50:36 2004
+@@ -5425,10 +5425,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/ftp/lftp/files/patch-src::Makefile.in b/ftp/lftp/files/patch-src::Makefile.in
index 174fe5510067..e69de29bb2d1 100644
--- a/ftp/lftp/files/patch-src::Makefile.in
+++ b/ftp/lftp/files/patch-src::Makefile.in
@@ -1,10 +0,0 @@
---- src/Makefile.in.orig	Mon Dec 22 14:56:28 2003
-+++ src/Makefile.in	Fri Dec 26 16:45:09 2003
-@@ -464,7 +464,6 @@
- 	done
- install-pkgverlibLTLIBRARIES: $(pkgverlib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	$(mkdir_p) $(DESTDIR)$(pkgverlibdir)
- 	@list='$(pkgverlib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f="`echo $$p | sed -e 's|^.*/||'`"; \