diff --git a/net/pure-ftpd/Makefile b/net/pure-ftpd/Makefile
index 0f6b83a87b7..d367774fa2e 100644
--- a/net/pure-ftpd/Makefile
+++ b/net/pure-ftpd/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.54 2011/03/07 23:27:24 sthen Exp $
+# $OpenBSD: Makefile,v 1.55 2011/04/25 09:26:47 sthen Exp $
 
 COMMENT=	small, easy to set up, fast and very secure FTP server
 
-DISTNAME=	pure-ftpd-1.0.30
+DISTNAME=	pure-ftpd-1.0.31
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/ \
+MASTER_SITES=	http://download.pureftpd.org/pub/pure-ftpd/releases/ \
+		ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/ \
 		ftp://ftp2.fr.pureftpd.org/pub/mirrors/ftp.fr.pureftpd.org/pub/pure-ftpd/releases/ \
 		ftp://ftp3.fr.pureftpd.org/pub/pure-ftpd/releases/ \
 		ftp://ftp4.fr.pureftpd.org/pub/pure-ftpd/releases/ \
diff --git a/net/pure-ftpd/distinfo b/net/pure-ftpd/distinfo
index d988b52e0ef..d1ebfdbcda4 100644
--- a/net/pure-ftpd/distinfo
+++ b/net/pure-ftpd/distinfo
@@ -1,5 +1,5 @@
-MD5 (pure-ftpd-1.0.30.tar.gz) = KeKmjnVtCfSv+PT3ZDWwIA==
-RMD160 (pure-ftpd-1.0.30.tar.gz) = g7fbaKmjM2jY7idXNDgBI34107I=
-SHA1 (pure-ftpd-1.0.30.tar.gz) = oZqtjG9egi4RgBRq251YvGN0QP0=
-SHA256 (pure-ftpd-1.0.30.tar.gz) = VxQm2dyKX9p4QXZJIQflFIFcz1sdzY7/0+3w/7VJfjs=
-SIZE (pure-ftpd-1.0.30.tar.gz) = 578115
+MD5 (pure-ftpd-1.0.31.tar.gz) = PCpnvABKUPTUCcei9gZkbQ==
+RMD160 (pure-ftpd-1.0.31.tar.gz) = KU2LAYK5Jhw4LYkCS9HmiRUian0=
+SHA1 (pure-ftpd-1.0.31.tar.gz) = dcmLSyRtK6vYMMtQUgf2LnjUSTE=
+SHA256 (pure-ftpd-1.0.31.tar.gz) = b1AzSlavp8ON23mppNnN7TmWOxZc3ODkK64nLkZCt0E=
+SIZE (pure-ftpd-1.0.31.tar.gz) = 557548
diff --git a/net/pure-ftpd/pkg/MESSAGE b/net/pure-ftpd/pkg/MESSAGE
deleted file mode 100644
index 90a3029db78..00000000000
--- a/net/pure-ftpd/pkg/MESSAGE
+++ /dev/null
@@ -1,7 +0,0 @@
-In order to start Pure-FTPd at boot-time, add something like this to
-/etc/rc.local:
-
-if [ -x ${PREFIX}/sbin/pure-ftpd ]; then
-  echo Starting Pure-FTPd
-  ${PREFIX}/sbin/pure-ftpd -A -B -H -u1000
-fi
diff --git a/net/pure-ftpd/pkg/PLIST b/net/pure-ftpd/pkg/PLIST
index 3dcc63c5d4d..b885704af49 100644
--- a/net/pure-ftpd/pkg/PLIST
+++ b/net/pure-ftpd/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.11 2009/10/27 23:45:28 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.12 2011/04/25 09:26:47 sthen Exp $
 @newgroup _pure-ftpd:642
 @newuser _pure-ftpd:642:_pure-ftpd:daemon:pure-ftpd user:/nonexistent:/sbin/nologin
 @bin bin/pure-pw
@@ -35,3 +35,4 @@ share/examples/pure-ftpd/xml_python_processors.txt
 %%ldap%%
 %%mysql%%
 %%postgresql%%
+@rcscript ${RCDIR}/pure_ftpd
diff --git a/net/pure-ftpd/pkg/pure_ftpd.rc b/net/pure-ftpd/pkg/pure_ftpd.rc
new file mode 100644
index 00000000000..de8e701c345
--- /dev/null
+++ b/net/pure-ftpd/pkg/pure_ftpd.rc
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# $OpenBSD: pure_ftpd.rc,v 1.1 2011/04/25 09:26:47 sthen Exp $
+
+daemon="${TRUEPREFIX}/sbin/pure-ftpd"
+daemon_flags="-A -B -H -u1000"
+
+. /etc/rc.d/rc.subr
+
+pexp="pure-ftpd: -pure-ftpd \(SERVER\)"
+rc_reload=NO
+
+rc_cmd $1