diff --git a/mail/solid-pop3d/Makefile b/mail/solid-pop3d/Makefile
new file mode 100644
index 00000000000..729f087565d
--- /dev/null
+++ b/mail/solid-pop3d/Makefile
@@ -0,0 +1,27 @@
+#
+# $OpenBSD: Makefile,v 1.1.1.1 2000/05/26 01:51:34 espie Exp $
+#
+
+DISTNAME=       	solid-pop3d-0.14
+CATEGORIES=		net mail
+MAINTAINER=		danh@nfol.com
+
+MASTER_SITES=		http://solidpop3d.pld.org.pl/
+
+LICENCE_TYPE=		GPL
+PERMIT_PACKAGE_CDROM=   Yes
+PERMIT_PACKAGE_FTP=     Yes
+PERMIT_DISTFILES_CDROM= Yes
+PERMIT_DISTFILES_FTP=   Yes
+
+HAS_CONFIGURE=	 	Yes
+CONFIGURE_ARGS+=	--sysconfdir='/etc'
+CONFIGURE_ARGS+=	--localstatedir="/var/spool/spop3d" 
+CONFIGURE_ARGS+=	--enable-last
+CONFIGURE_ARGS+=	--enable-bulletins
+CONFIGURE_ARGS+=	--enable-nonip
+
+FAKE=			Yes
+FAKE_FLAGS+=		prefix='${WRKINST}${PREFIX}'
+
+.include <bsd.port.mk>
diff --git a/mail/solid-pop3d/files/md5 b/mail/solid-pop3d/files/md5
new file mode 100644
index 00000000000..38e27ea58a5
--- /dev/null
+++ b/mail/solid-pop3d/files/md5
@@ -0,0 +1,3 @@
+MD5 (solid-pop3d-0.14.tar.gz) = 05974b00a495b520687f763d1f074f1c
+RMD160 (solid-pop3d-0.14.tar.gz) = 311ba1acc06dc7ac589e83c24a43baeb27275ddc
+SHA1 (solid-pop3d-0.14.tar.gz) = dc452c5e09acb0fccc9b8655c8c25699434e8c14
diff --git a/mail/solid-pop3d/patches/patch-aa b/mail/solid-pop3d/patches/patch-aa
new file mode 100644
index 00000000000..f47f97f1936
--- /dev/null
+++ b/mail/solid-pop3d/patches/patch-aa
@@ -0,0 +1,11 @@
+--- doc/Makefile.in.orig	Fri May 19 14:11:49 2000
++++ doc/Makefile.in	Fri May 19 14:11:56 2000
+@@ -15,8 +15,6 @@
+ srcdir = @srcdir@
+ VPATH = @srcdir@
+ 
+-DESTDIR =
+-
+ top_builddir = ..
+ 
+ EXTRA_DIST = spop3d config.example
diff --git a/mail/solid-pop3d/patches/patch-ab b/mail/solid-pop3d/patches/patch-ab
new file mode 100644
index 00000000000..067f81e8898
--- /dev/null
+++ b/mail/solid-pop3d/patches/patch-ab
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	Fri May 19 14:12:21 2000
++++ src/Makefile.in	Fri May 19 14:12:28 2000
+@@ -26,8 +26,6 @@
+ sysconfdir = @sysconfdir@
+ localstatedir = @localstatedir@
+ 
+-DESTDIR =
+-
+ top_builddir = ..
+ 
+ INSTALL = @INSTALL@
diff --git a/mail/solid-pop3d/patches/patch-ac b/mail/solid-pop3d/patches/patch-ac
new file mode 100644
index 00000000000..4eaecaf0a1c
--- /dev/null
+++ b/mail/solid-pop3d/patches/patch-ac
@@ -0,0 +1,11 @@
+--- man/Makefile.in.orig	Fri May 19 14:12:53 2000
++++ man/Makefile.in	Fri May 19 14:12:59 2000
+@@ -20,8 +20,6 @@
+ prefix = @prefix@
+ mandir = @mandir@
+ 
+-DESTDIR =
+-
+ top_builddir = ..
+ 
+ INSTALL = @INSTALL@
diff --git a/mail/solid-pop3d/patches/patch-ad b/mail/solid-pop3d/patches/patch-ad
new file mode 100644
index 00000000000..3baffe5be43
--- /dev/null
+++ b/mail/solid-pop3d/patches/patch-ad
@@ -0,0 +1,11 @@
+--- src/const.h.orig	Fri May 19 14:13:34 2000
++++ src/const.h	Fri May 19 14:13:46 2000
+@@ -36,7 +36,7 @@
+ #define DEFWCCOUNT 5
+ 
+ #ifdef MDMAILBOX
+-#define DEFMAILDROPNAME "/var/spool/mail/%s"
++#define DEFMAILDROPNAME "/var/mail/%s"
+ #else
+ #define DEFMAILDROPNAME "Maildir"
+ #endif
diff --git a/mail/solid-pop3d/pkg/COMMENT b/mail/solid-pop3d/pkg/COMMENT
new file mode 100644
index 00000000000..823e2f6fc3a
--- /dev/null
+++ b/mail/solid-pop3d/pkg/COMMENT
@@ -0,0 +1 @@
+Solid POP3 server
diff --git a/mail/solid-pop3d/pkg/DEINSTALL b/mail/solid-pop3d/pkg/DEINSTALL
new file mode 100644
index 00000000000..a694fa90f46
--- /dev/null
+++ b/mail/solid-pop3d/pkg/DEINSTALL
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+do-deinstall () 
+{
+	if [ -d /var/spool/spop3d ]; then
+		rm -rf /var/spool/spop3d
+	fi
+	if [ -f /etc/spop3d.conf ]; then
+		echo "+------------"
+		echo "| If you are removing this package and not planning"
+		echo "| to re-install it at a future time, it is safe to"
+		echo "| remove /etc/spop3d.conf."
+		echo "+------------"
+	fi
+}
+
+do-deinstall
diff --git a/mail/solid-pop3d/pkg/DESCR b/mail/solid-pop3d/pkg/DESCR
new file mode 100644
index 00000000000..aa7da2b730b
--- /dev/null
+++ b/mail/solid-pop3d/pkg/DESCR
@@ -0,0 +1,20 @@
+The Solid POP3 Server is an implementation of a Post Office Protocol version 3 
+server that has flexibility as its main goal. The server is easily configurable 
+and has support for few features such as:
+
+	- APOP authentication scheme
+	- virtual hosting
+	- maildir and mailbox handling
+	- bulletins
+	- expiration of messages
+
+Each user can specify his maildrop (its position and type). The format used in 
+specification of maildrop's position should handle almost all widely-used system
+configurations. The server also seems to be fast, however no tests have been 
+performed, so it's rather relative feeling. The design used is very similar to 
+the design of Solar Designer's POPA3D server. This solution let's minimalize 
+size of code working with root privileges. The code was also heavily checked for
+buffer overflow leaks and file races. None have been found as for now. All 
+operations on files are done with user privileges. There is no SUID APOP secrets
+database management program (as in QPOP). Each user can specify his secret in 
+his own home directory.
diff --git a/mail/solid-pop3d/pkg/INSTALL b/mail/solid-pop3d/pkg/INSTALL
new file mode 100644
index 00000000000..7d8a1a58658
--- /dev/null
+++ b/mail/solid-pop3d/pkg/INSTALL
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+post_install () 
+{
+	if [ ! -d /var/spool/spop3d ]; then
+		install -d -m 755 -o root -g wheel /var/spool/spop3d
+		install -d -m 755 -o root -g wheel /var/spool/spop3d/bulletins
+	fi
+}
+
+usage ()
+{
+	echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
+	exit 1
+}
+
+if [ $# -ne 2 ]; then
+	usage
+fi
+
+case ${2} in
+	"PRE-INSTALL")
+		;;
+	"POST-INSTALL")
+		post_install
+		;;
+	*)
+		usage
+		;;
+esac
diff --git a/mail/solid-pop3d/pkg/MESSAGE b/mail/solid-pop3d/pkg/MESSAGE
new file mode 100644
index 00000000000..a74c8f98b38
--- /dev/null
+++ b/mail/solid-pop3d/pkg/MESSAGE
@@ -0,0 +1,12 @@
++---------------
+| This program requires an account named spop3d.  You'll also
+| have to edit /etc/inetd.conf manually and add a line like the
+| following:
+|
+|   pop3 stream tcp nowait root /usr/local/sbin/spop3d spop3d
+|
+| An optional global configuration file may be used in /etc
+| called spop3d.conf.
+|
+| See spop3d(8) and spop3d.conf(5) for available options.
++---------------
diff --git a/mail/solid-pop3d/pkg/PLIST b/mail/solid-pop3d/pkg/PLIST
new file mode 100644
index 00000000000..b14f2ee7f5c
--- /dev/null
+++ b/mail/solid-pop3d/pkg/PLIST
@@ -0,0 +1,5 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2000/05/26 01:51:34 espie Exp $
+man/man5/dot-spop3d.5
+man/man5/spop3d.conf.5
+man/man8/spop3d.8
+sbin/spop3d