diff --git a/net/pure-ftpd/Makefile b/net/pure-ftpd/Makefile
index 33fa837a746..b4ce870768e 100644
--- a/net/pure-ftpd/Makefile
+++ b/net/pure-ftpd/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.3 2001/12/17 20:33:34 brad Exp $
+# $OpenBSD: Makefile,v 1.4 2001/12/27 20:13:45 brad Exp $
 
 COMMENT=	"small, easy to set up, fast and very secure FTP server"
 
-DISTNAME=	pure-ftpd-1.0.5
+DISTNAME=	pure-ftpd-1.0.7
 CATEGORIES=	net
 NEED_VERSION=	1.500
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -19,18 +19,37 @@ PERMIT_DISTFILES_FTP=	Yes
 
 CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS+= --with-everything \
-		 --with-paranoidmsg \
-		 --without-ldap \
-		 --without-mysql
+		 --with-paranoidmsg
 
-FLAVORS=	no_banner
+FLAVORS=	ldap mysql postgresql no_banner
 FLAVOR?=
 
+.if ${FLAVOR:L:Mldap}
+LIB_DEPENDS+= ldap.2,lber:openldap-client-2.*:databases/openldap
+CONFIGURE_ARGS+= --with-ldap="${LOCALBASE}"
+DOCS+=	README.LDAP
+CONF_FILE+= pureftpd-ldap.conf
+.endif
+
+.if ${FLAVOR:L:Mmysql}
+LIB_DEPENDS+= lib/mysql/mysqlclient.10:mysql-client-3.23.*:databases/mysql
+CONFIGURE_ARGS+= --with-mysql="${LOCALBASE}"
+DOCS+=	README.MySQL
+CONF_FILE+= pureftpd-mysql.conf
+.endif
+
+.if ${FLAVOR:L:Mpostgresql}
+LIB_DEPENDS+= pq.2::databases/postgresql
+CONFIGURE_ARGS+= --with-pgsql="${LOCALBASE}"
+DOCS+=	README.PGSQL
+CONF_FILE+= pureftpd-pgsql.conf
+.endif
+
 .if ${FLAVOR:L:Mno_banner}
 CONFIGURE_ARGS+= --without-banner
 .endif
 
-DOCS=	README README.Configuration-File README.Contrib \
+DOCS+=	README README.Configuration-File README.Contrib \
 	README.Virtual-Users poweredby.jpg
 
 CONTRIB= xml_python_processors.txt
@@ -43,6 +62,10 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/configuration-file/pure-ftpd.conf \
 		${PREFIX}/share/examples/pure-ftpd/pure-ftpd.conf.sample
 	cd ${WRKSRC}; ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/pure-ftpd
+.if defined(CONF_FILE) && !empty(CONF_FILE)
+	cd ${WRKSRC}; ${INSTALL_DATA} ${CONF_FILE} \
+		${PREFIX}/share/examples/pure-ftpd
+.endif
 	cd ${WRKSRC}/contrib; ${INSTALL_DATA} ${CONTRIB} \
 		${PREFIX}/share/examples/pure-ftpd
 
diff --git a/net/pure-ftpd/distinfo b/net/pure-ftpd/distinfo
index fa29d127d74..585fa2602b1 100644
--- a/net/pure-ftpd/distinfo
+++ b/net/pure-ftpd/distinfo
@@ -1,3 +1,3 @@
-MD5 (pure-ftpd-1.0.5.tar.gz) = 5d573a15056b5a2d4915030225909cd8
-RMD160 (pure-ftpd-1.0.5.tar.gz) = 8060e5de01ed7a945198d132be9e6e9630280348
-SHA1 (pure-ftpd-1.0.5.tar.gz) = e215eb05b0a5eb7a3b6c9bd858883a4e12586d4e
+MD5 (pure-ftpd-1.0.7.tar.gz) = c8e36b63d95870113111db46481f9e8c
+RMD160 (pure-ftpd-1.0.7.tar.gz) = 014e661660109384610abf91cdf5746abc23e596
+SHA1 (pure-ftpd-1.0.7.tar.gz) = 0fb3754e00d9dfa185bd6dd567bde0cc534a6d90
diff --git a/net/pure-ftpd/pkg/DESCR b/net/pure-ftpd/pkg/DESCR
index 093f98badc4..1924c4de89f 100644
--- a/net/pure-ftpd/pkg/DESCR
+++ b/net/pure-ftpd/pkg/DESCR
@@ -5,14 +5,17 @@ Unlike other popular FTP servers, it's designed to be secure in default
 configuration, has no known buffer overflow, it is really trivial to set
 up and it is especially designed for modern kernels.
 
-Features include chroot()ed home directories, virtual domains, built-in
-'ls', anti-warez system, bounded ports for passive downloads, FXP
-protocol, bandwidth throttling, ratios, LDAP, customizable SQL, fortune
-files, Apache-like log files, fast standalone mode, text / HTML / XML
-real-time status report, virtual users, virtual quotas and more.
+Features include chroot()ed and/or virtual chroot()ed home directories,
+virtual domains, built-in 'ls', anti-warez system, bounded ports for
+passive downloads, FXP protocol, bandwidth throttling, ratios,
+LDAP / MySQL / PostgreSQL-based authentication, fortune files, Apache-like
+log files, fast standalone mode, text / HTML / XML real-time status report,
+virtual users, virtual quotas and more.
 
 Flavors:
-	no_banner - Build pure-ftpd so as to not display a banner on 
-		    initial connection.
+	     ldap - Build with LDAP support as an authentication source
+	    mysql - Build with MySQL support as an authentication source
+       postgresql - Build with PostgreSQL support as an authentication source
+	no_banner - Build pufe-ftpd to not display a banner on connection
 
 WWW: ${HOMEPAGE}
diff --git a/net/pure-ftpd/pkg/PFRAG.ldap b/net/pure-ftpd/pkg/PFRAG.ldap
new file mode 100644
index 00000000000..4cb5cba34b1
--- /dev/null
+++ b/net/pure-ftpd/pkg/PFRAG.ldap
@@ -0,0 +1,3 @@
+@comment $OpenBSD: PFRAG.ldap,v 1.1 2001/12/27 20:13:45 brad Exp $
+share/doc/pure-ftpd/README.LDAP
+share/examples/pure-ftpd/pureftpd-ldap.conf
diff --git a/net/pure-ftpd/pkg/PFRAG.mysql b/net/pure-ftpd/pkg/PFRAG.mysql
new file mode 100644
index 00000000000..99cca833ace
--- /dev/null
+++ b/net/pure-ftpd/pkg/PFRAG.mysql
@@ -0,0 +1,3 @@
+@comment $OpenBSD: PFRAG.mysql,v 1.1 2001/12/27 20:13:45 brad Exp $
+share/doc/pure-ftpd/README.MySQL
+share/examples/pure-ftpd/pureftpd-mysql.conf
diff --git a/net/pure-ftpd/pkg/PFRAG.postgresql b/net/pure-ftpd/pkg/PFRAG.postgresql
new file mode 100644
index 00000000000..14f8062b483
--- /dev/null
+++ b/net/pure-ftpd/pkg/PFRAG.postgresql
@@ -0,0 +1,3 @@
+@comment $OpenBSD: PFRAG.postgresql,v 1.1 2001/12/27 20:13:45 brad Exp $
+share/doc/pure-ftpd/README.PGSQL
+share/examples/pure-ftpd/pureftpd-pgsql.conf
diff --git a/net/pure-ftpd/pkg/PLIST b/net/pure-ftpd/pkg/PLIST
index 5c024963149..670459afafb 100644
--- a/net/pure-ftpd/pkg/PLIST
+++ b/net/pure-ftpd/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2001/12/14 16:31:32 brad Exp $
+@comment $OpenBSD: PLIST,v 1.2 2001/12/27 20:13:45 brad Exp $
 bin/pure-pw
 bin/pure-pwconvert
 bin/pure-statsdecode
@@ -23,5 +23,8 @@ share/doc/pure-ftpd/README.Virtual-Users
 share/doc/pure-ftpd/poweredby.jpg
 share/examples/pure-ftpd/pure-ftpd.conf.sample
 share/examples/pure-ftpd/xml_python_processors.txt
+%%ldap%%
+%%mysql%%
+%%postgresql%%
 @dirrm share/examples/pure-ftpd
 @dirrm share/doc/pure-ftpd