diff -ruN --exclude=CVS /usr/ports/ftp/bftpd.orig/Makefile /usr/ports/ftp/bftpd/Makefile
--- /usr/ports/ftp/bftpd.orig/Makefile	Thu May 10 12:17:31 2007
+++ /usr/ports/ftp/bftpd/Makefile	Thu May 24 19:37:42 2007
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	bftpd
-PORTVERSION=	1.6
+PORTVERSION=	1.8.4
 CATEGORIES=	ftp
-MASTER_SITES=	SF
+MASTER_SITES=	http://freebsd.alaskaparadise.com/source/
 
 MAINTAINER=	beech@alaskaparadise.com
 COMMENT=	Very configurable FTP server that can do chroot easily
diff -ruN --exclude=CVS /usr/ports/ftp/bftpd.orig/distinfo /usr/ports/ftp/bftpd/distinfo
--- /usr/ports/ftp/bftpd.orig/distinfo	Thu May 10 12:17:31 2007
+++ /usr/ports/ftp/bftpd/distinfo	Thu May 24 19:02:38 2007
@@ -1,3 +1,3 @@
-MD5 (bftpd-1.6.tar.gz) = 203ebbe285857a4b001d4a9872cffce4
-SHA256 (bftpd-1.6.tar.gz) = abbb20380f7ca4606e0e7d7586ad74d457b637839d560502e9547d8e91a2c986
-SIZE (bftpd-1.6.tar.gz) = 112303
+MD5 (bftpd-1.8.4.tar.gz) = dc97121eda9b93226899ff7c9ea5acf1
+SHA256 (bftpd-1.8.4.tar.gz) = 6375124e0f4709795b7fc8f499f70c28fb1c6d7312b3b88cbfc84d8e3712855c
+SIZE (bftpd-1.8.4.tar.gz) = 114815
diff -ruN --exclude=CVS /usr/ports/ftp/bftpd.orig/files/patch-login.c /usr/ports/ftp/bftpd/files/patch-login.c
--- /usr/ports/ftp/bftpd.orig/files/patch-login.c	Thu May 10 12:17:31 2007
+++ /usr/ports/ftp/bftpd/files/patch-login.c	Wed Dec 31 14:00:00 1969
@@ -1,12 +0,0 @@
-$FreeBSD: ports/ftp/bftpd/files/patch-login.c,v 1.1 2002/03/29 07:29:30 petef Exp $
-
---- login.c.orig	Thu Mar 28 10:10:15 2002
-+++ login.c	Thu Mar 28 10:10:22 2002
-@@ -323,7 +323,6 @@
- 			   pam_strerror(pamh, retval));
- 		return 1;
- 	}
--	pam_fail_delay(pamh, 0);
- 	retval = pam_authenticate(pamh, 0);
- 	if (retval == PAM_SUCCESS)
- 		retval = pam_acct_mgmt(pamh, 0);
diff -ruN --exclude=CVS /usr/ports/ftp/bftpd.orig/files/patch-main.c /usr/ports/ftp/bftpd/files/patch-main.c
--- /usr/ports/ftp/bftpd.orig/files/patch-main.c	Wed Dec 31 14:00:00 1969
+++ /usr/ports/ftp/bftpd/files/patch-main.c	Thu May 24 19:19:28 2007
@@ -0,0 +1,11 @@
+--- main.c.orig	Sun Apr  8 12:34:59 2007
++++ main.c	Thu May 24 19:11:45 2007
+@@ -47,6 +47,8 @@
+ #  include <sys/wait.h>
+ # endif
+ #endif
++/* add BSD support */
++#include <limits.h>
+ 
+ #include "main.h"
+ #include "cwd.h"
diff -ruN --exclude=CVS /usr/ports/ftp/bftpd.orig/files/patch-options.c /usr/ports/ftp/bftpd/files/patch-options.c
--- /usr/ports/ftp/bftpd.orig/files/patch-options.c	Wed Dec 31 14:00:00 1969
+++ /usr/ports/ftp/bftpd/files/patch-options.c	Thu May 24 19:20:12 2007
@@ -0,0 +1,11 @@
+--- options.c.orig	Fri Apr 13 16:19:15 2007
++++ options.c	Thu May 24 19:13:39 2007
+@@ -3,6 +3,8 @@
+ #include <stdlib.h>
+ #include <grp.h>
+ #include <unistd.h>
++/* add BSD support */
++#include <limits.h>
+ 
+ #include "options.h"
+ #include "mystring.h"
diff -ruN --exclude=CVS /usr/ports/ftp/bftpd.orig/pkg-descr /usr/ports/ftp/bftpd/pkg-descr
--- /usr/ports/ftp/bftpd.orig/pkg-descr	Thu May 10 12:17:31 2007
+++ /usr/ports/ftp/bftpd/pkg-descr	Thu May 24 20:09:36 2007
@@ -1,10 +1,8 @@
-bftpd is an FTP server for Linux, BSD/OS, FreeBSD, Solaris, DG-UX
-and Tru64.  It runs either with inetd or standalone.
-
-It tries to be very configurable while being fast and small. You
-can make defaults for each configuration option, and then override
-these defaults in user-specific structures. Support for
-directory-specific options is planned.
+The Bftpd file server is designed to be as small and easy to manage as possible,
+while providing most of the features you would expect from a file server. On
+most home systems, Bftpd is ready to work out-of-the-box without requiring any
+extra configuration. Production systems can be set up by editing a few lines in
+an easy-to-read config file.
 
 Features of bftpd include:
 	* Easy configuration
@@ -17,7 +15,7 @@
 	* PAM support
 	* Support for SITE CHOWN/CHMOD
 
-WWW: http://www.bftpd.org/
+WWW: http://bftpd.sourceforge.net/
 
-- Pete
-petef@databits.net
+- Beech
+beech@alaskaparadise.com