diff --git a/mail/solid-pop3d/patches/patch-ae b/mail/solid-pop3d/patches/patch-ae
new file mode 100644
index 00000000000..14a2560d8e5
--- /dev/null
+++ b/mail/solid-pop3d/patches/patch-ae
@@ -0,0 +1,33 @@
+$OpenBSD: patch-ae,v 1.1 2000/05/31 16:09:52 form Exp $
+--- man/spop3d.8.orig	Wed May 31 22:48:35 2000
++++ man/spop3d.8	Wed May 31 22:50:55 2000
+@@ -70,7 +70,7 @@ and
+ is expanded to
+ .I /home/jurekb/Mail/bugtraq
+ for "jurekb" user on my system. The default is
+-.I /var/spool/mail/%s
++.I /var/mail/%s
+ or
+ .I Maildir
+ when mailbox support is not compiled in.
+@@ -108,7 +108,7 @@ Seconds are used if no suffix is present
+ .RE
+ .IP "-f \fIconfigfile\fP"
+ Specify a configuration file. The default is
+-.I ${/spop3d.conf
++.I /etc/spop3d.conf
+ .IP "-d"
+ Set server into debugging mode.
+ .IP "-r"
+@@ -119,9 +119,9 @@ Allow root login. This feature is disabl
+ User configuration file.
+ .IP "~/.spop3d-bull"
+ This file is used by bulletin code to determine last bulletin received by user.
+-.IP ${localstatedir}/bulletins"
++.IP /var/spool/spop3d/bulletins"
+ Bulletins directory.
+-.IP ${sysconfdir}/spop3d.conf"
++.IP /etc/spop3d.conf"
+ Global configuration file.
+ .SH SEE ALSO
+ .PP
diff --git a/mail/solid-pop3d/patches/patch-af b/mail/solid-pop3d/patches/patch-af
new file mode 100644
index 00000000000..3760567e57c
--- /dev/null
+++ b/mail/solid-pop3d/patches/patch-af
@@ -0,0 +1,38 @@
+--- man/spop3d.conf.5.orig	Wed May 31 22:58:45 2000
++++ man/spop3d.conf.5	Wed May 31 22:59:44 2000
+@@ -107,7 +107,7 @@
+ .B MailDropName string
+ Specify path to maildrop. The format is the same as for \fB-n\fP option in
+ \fBspop3d\fP (8). Default value is
+-.I /var/spool/mail/%s
++.I /var/mail/%s
+ .TP
+ .B MailDropType string
+ Specify type of maildrop. The allowed values are \fImailbox\fP and
+@@ -159,7 +159,7 @@
+ .TP
+ .B BulletinDirectory string
+ Specify path to bulletin directory. 
+-Default value is ${localstatedir}/bulletins (/usr/local/var/bulletins).
++Default value is /var/spool/spop3d/bulletins.
+ .TP
+ .B AddBuletins boolean
+ Server checks for new bulletins in BulletinDirectory if enabled.
+@@ -181,7 +181,7 @@
+ 	DoMapping 	true
+ 	UnreadExpire	never
+ 	APOPServerName	jakis.tam.host.w.pl
+-	MailDropName	"/var/spool/mail/%s" /* It is a comment */
++	MailDropName	"/var/mail/%s" /* It is a comment */
+ 	MailDropType	mailbox
+ 	AutoLogoutTime	5s
+ 	UserOverride	yes
+@@ -196,7 +196,7 @@
+ syntax error occurs in a configuration file. If a configuration file doesn't
+ exist (stat() failed), the server logs this fact only when in debugging mode.
+ .SH FILES
+-.IP "${sysconfdir}/spop3d.conf"
++.IP "/etc/spop3d.conf"
+ Global configuration file.
+ .SH SEE ALSO
+ .PP