diff --git a/mail/solid-pop3d/Makefile b/mail/solid-pop3d/Makefile
index 03df74c9d2c..60283f0c7e3 100644
--- a/mail/solid-pop3d/Makefile
+++ b/mail/solid-pop3d/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.17 2008/07/02 14:32:30 naddy Exp $
+# $OpenBSD: Makefile,v 1.18 2008/12/16 20:14:07 sthen Exp $
 
 COMMENT=	flexible POP3 server
 
 VERSION=	0.15
 DISTNAME=	solid-pop3d-${VERSION}
-PKGNAME=	${DISTNAME}p0		# also see below
+PKGNAME=	${DISTNAME}p3
 CATEGORIES=	mail
 MASTER_SITES=	ftp://dione.ids.pl/pub/solidpop3d/
 
@@ -31,7 +31,6 @@ NO_REGRESS=	Yes
 # enable support for APOP authentication.
 .if ${FLAVOR:L:Mapop}
 CONFIGURE_ARGS+= --enable-userconfig --enable-apop
-PKGNAME=${DISTNAME}p2
 .else
 CONFIGURE_ARGS+= --disable-userconfig --disable-apop
 .endif
diff --git a/mail/solid-pop3d/patches/patch-src_md5_c b/mail/solid-pop3d/patches/patch-src_md5_c
new file mode 100644
index 00000000000..15942fcd7d8
--- /dev/null
+++ b/mail/solid-pop3d/patches/patch-src_md5_c
@@ -0,0 +1,11 @@
+$OpenBSD: patch-src_md5_c,v 1.1 2008/12/16 20:14:07 sthen Exp $
+--- src/md5.c.orig	Tue Dec 16 20:10:29 2008
++++ src/md5.c	Tue Dec 16 20:10:36 2008
+@@ -38,6 +38,7 @@
+ #endif
+ 
+ #include "md5.h"
++#include "config.h"
+ 
+ #ifdef _LIBC
+ #include <endian.h>