diff --git a/net/vsftpd/Makefile b/net/vsftpd/Makefile
new file mode 100644
index 00000000000..6b6ac95e09c
--- /dev/null
+++ b/net/vsftpd/Makefile
@@ -0,0 +1,30 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2003/02/19 15:42:02 couderc Exp $
+
+COMMENT=		"Ftp daemon which aims to be secure"
+
+VERSION=		1.1.3
+DISTNAME=		vsftpd-${VERSION}
+CATEGORIES=		net
+
+HOMEPAGE=		http://vsftpd.beasts.org/
+
+MAINTAINER=		Damien Couderc <couderc@openbsd.org>
+
+# GPL2
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+
+MASTER_SITES=		ftp://vsftpd.beasts.org/users/cevans/
+
+ALL_TARGET=		vsftpd
+
+do-install:
+	${INSTALL} ${WRKSRC}/vsftpd ${PREFIX}/sbin/
+	${INSTALL_MAN} ${WRKSRC}/vsftpd.8 ${PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/vsftpd.conf.5 ${PREFIX}/man/man5
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/vsftpd
+	@cp -r ${WRKSRC}/EXAMPLE/* ${PREFIX}/share/examples/vsftpd
+
+.include <bsd.port.mk>
diff --git a/net/vsftpd/distinfo b/net/vsftpd/distinfo
new file mode 100644
index 00000000000..94fae91244c
--- /dev/null
+++ b/net/vsftpd/distinfo
@@ -0,0 +1,3 @@
+MD5 (vsftpd-1.1.3.tar.gz) = 3f5f59be09a6f89e516a75ad0d1e3802
+RMD160 (vsftpd-1.1.3.tar.gz) = 73efdb14707a0c8af7880ef3ebf946bc464d111a
+SHA1 (vsftpd-1.1.3.tar.gz) = 495ae55456d4c1ddc44066a6d09a51d26084cf1b
diff --git a/net/vsftpd/patches/patch-Makefile b/net/vsftpd/patches/patch-Makefile
new file mode 100644
index 00000000000..c79a28bc331
--- /dev/null
+++ b/net/vsftpd/patches/patch-Makefile
@@ -0,0 +1,15 @@
+$OpenBSD: patch-Makefile,v 1.1.1.1 2003/02/19 15:42:02 couderc Exp $
+--- Makefile.orig	Tue Oct 22 01:15:16 2002
++++ Makefile	Wed Feb 12 23:18:00 2003
+@@ -1,9 +1,9 @@
+ # Makefile for systems with GNU tools
+-CC 	=	gcc
++CC 	=	cc
+ INSTALL	=	install
+ IFLAGS  = -idirafter dummyinc
+ #CFLAGS = -g
+-CFLAGS	=	-O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion
++CFLAGS	+=	-O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion
+ 
+ LIBS	=	`./vsf_findlibs.sh`
+ LINK	=	-Wl,-s
diff --git a/net/vsftpd/patches/patch-sysutil_c b/net/vsftpd/patches/patch-sysutil_c
new file mode 100644
index 00000000000..8438da45d52
--- /dev/null
+++ b/net/vsftpd/patches/patch-sysutil_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-sysutil_c,v 1.1.1.1 2003/02/19 15:42:02 couderc Exp $
+--- sysutil.c.orig	Fri Oct 25 19:32:52 2002
++++ sysutil.c	Sun Feb  2 19:43:03 2003
+@@ -1312,7 +1312,7 @@ vsf_sysutil_statbuf_get_sortkey_mtime(
+    * more recent dates appear later in the alphabet! Most notably, we must
+    * make sure we pad to the same length with 0's 
+    */
+-  snprintf(intbuf, sizeof(intbuf), "%030ld", p_stat->st_mtime);
++  snprintf(intbuf, sizeof(intbuf), "%030ld", (long int) p_stat->st_mtime);
+   return intbuf;
+ }
+ 
diff --git a/net/vsftpd/pkg/DESCR b/net/vsftpd/pkg/DESCR
new file mode 100644
index 00000000000..5e278102978
--- /dev/null
+++ b/net/vsftpd/pkg/DESCR
@@ -0,0 +1,9 @@
+vsftpd is an FTP server, or daemon. The "vs" stands for Very Secure.
+It has been written with security in mind, and carefully designed to
+be resilient to attack.
+
+Recent evidence shows that vsftpd is also extremely fast and scalable.
+vsftpd has achieved ~4000 concurrent users on a single machine, in a
+production environment.
+
+WWW: ${HOMEPAGE}
diff --git a/net/vsftpd/pkg/PLIST b/net/vsftpd/pkg/PLIST
new file mode 100644
index 00000000000..977bb20ca94
--- /dev/null
+++ b/net/vsftpd/pkg/PLIST
@@ -0,0 +1,25 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2003/02/19 15:42:02 couderc Exp $
+man/man5/vsftpd.conf.5
+man/man8/vsftpd.8
+sbin/vsftpd
+share/examples/vsftpd/INTERNET_SITE/README
+share/examples/vsftpd/INTERNET_SITE/vsftpd.conf
+share/examples/vsftpd/INTERNET_SITE/vsftpd.xinetd
+share/examples/vsftpd/INTERNET_SITE_NOINETD/README
+share/examples/vsftpd/INTERNET_SITE_NOINETD/vsftpd.conf
+share/examples/vsftpd/PER_IP_CONFIG/README
+share/examples/vsftpd/PER_IP_CONFIG/hosts.allow
+share/examples/vsftpd/README
+share/examples/vsftpd/VIRTUAL_HOSTS/README
+share/examples/vsftpd/VIRTUAL_USERS/README
+share/examples/vsftpd/VIRTUAL_USERS/logins.txt
+share/examples/vsftpd/VIRTUAL_USERS/vsftpd.conf
+share/examples/vsftpd/VIRTUAL_USERS/vsftpd.pam
+share/examples/vsftpd/VIRTUAL_USERS_2/README
+@dirrm share/examples/vsftpd/VIRTUAL_USERS_2
+@dirrm share/examples/vsftpd/VIRTUAL_USERS
+@dirrm share/examples/vsftpd/VIRTUAL_HOSTS
+@dirrm share/examples/vsftpd/PER_IP_CONFIG
+@dirrm share/examples/vsftpd/INTERNET_SITE_NOINETD
+@dirrm share/examples/vsftpd/INTERNET_SITE
+@dirrm share/examples/vsftpd