diff --git a/srcpkgs/vsftpd/files/vsftpd-ipv6/run b/srcpkgs/vsftpd/files/vsftpd-ipv6/run
new file mode 100755
index 00000000000..6b410bc6490
--- /dev/null
+++ b/srcpkgs/vsftpd/files/vsftpd-ipv6/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+mkdir -pm 0755 /var/empty
+exec vsftpd -obackground=no -olisten=no -olisten_ipv6=yes ${OPTS} 
diff --git a/srcpkgs/vsftpd/files/vsftpd/run b/srcpkgs/vsftpd/files/vsftpd/run
new file mode 100755
index 00000000000..9657291d60c
--- /dev/null
+++ b/srcpkgs/vsftpd/files/vsftpd/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+mkdir -pm 0755 /var/empty
+exec vsftpd -obackground=no ${OPTS} 
diff --git a/srcpkgs/vsftpd/patches/var_empty.patch b/srcpkgs/vsftpd/patches/var_empty.patch
new file mode 100644
index 00000000000..547315fbbde
--- /dev/null
+++ b/srcpkgs/vsftpd/patches/var_empty.patch
@@ -0,0 +1,11 @@
+--- tunables.c.orig	2015-12-03 23:13:22.888994282 +0100
++++ tunables.c	2015-12-03 23:13:33.716994236 +0100
+@@ -254,7 +254,7 @@ tunables_load_defaults()
+   /* -rw------- */
+   tunable_chown_upload_mode = 0600;
+ 
+-  install_str_setting("/usr/share/empty", &tunable_secure_chroot_dir);
++  install_str_setting("/var/empty", &tunable_secure_chroot_dir);
+   install_str_setting("ftp", &tunable_ftp_username);
+   install_str_setting("root", &tunable_chown_username);
+   install_str_setting("/var/log/xferlog", &tunable_xferlog_file);
diff --git a/srcpkgs/vsftpd/template b/srcpkgs/vsftpd/template
new file mode 100644
index 00000000000..91b8eacdcf5
--- /dev/null
+++ b/srcpkgs/vsftpd/template
@@ -0,0 +1,35 @@
+# Template file for 'vsftpd'
+pkgname=vsftpd
+version=3.0.3
+revision=1
+build_style=gnu-makefile
+makedepends="pam-devel libcap-devel libressl-devel"
+short_desc="FTP deamon with focus on security"
+maintainer="Enno Boland <gottox@voidlinux.eu>"
+license="GPL-3"
+homepage="https://security.appspot.com/vsftpd.html"
+distfiles="https://security.appspot.com/downloads/$pkgname-$version.tar.gz"
+checksum=9d4d2bf6e6e2884852ba4e69e157a2cecd68c5a7635d66a3a8cf8d898c955ef7
+system_accounts="ftp"
+ftp_pgroup="nogroup"
+
+do_configure() {
+	sed -i 's@^#undef VSF_BUILD_SSL$@#define VSF_BUILD_SSL@' \
+		builddefs.h
+}
+
+do_install() {
+	vbin $pkgname
+	vconf $pkgname.conf
+	vman $pkgname.8
+	vman $pkgname.conf.5
+	vinstall EXAMPLE/INTERNET_SITE/$pkgname.xinetd 644 $pkgdir/etc/xinetd.d/$pkgname
+	vinstall RedHat/$pkgname.log 644 $DESTDIR/etc/logrotate.d/$pkgname
+	vsv vsftpd
+	vsv vsftpd-ipv6
+
+	for i in BENCHMARKS BUGS Changelog FAQ INSTALL README README.ssl REFS \
+		REWARD SPEED TODO TUNING; do
+		vinstall $i 644 "$DESTDIR"/usr/share/doc/$pkgname/$i
+	done
+}