diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index f0094bfb600..99875f066c7 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.110 2007/04/13 13:22:25 bernd Exp $
+# $OpenBSD: Makefile,v 1.111 2007/08/31 14:20:46 rui Exp $
 
 COMMENT=	"mail retrieval utility for POP2, POP3, KPOP, IMAP and more"
 
 DISTNAME=	fetchmail-6.3.8
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_BERLIOS:=fetchmail/}
 
diff --git a/mail/fetchmail/patches/patch-sink_c b/mail/fetchmail/patches/patch-sink_c
new file mode 100644
index 00000000000..6b357cd4465
--- /dev/null
+++ b/mail/fetchmail/patches/patch-sink_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-sink_c,v 1.1 2007/08/31 14:20:46 rui Exp $
+--- sink.c.orig	Fri Aug 31 14:24:34 2007
++++ sink.c	Fri Aug 31 14:25:15 2007
+@@ -262,7 +262,7 @@ static int send_bouncemail(struct query *ctl, struct m
+     const char *md1 = "MAILER-DAEMON", *md2 = "MAILER-DAEMON@";
+ 
+     /* don't bounce in reply to undeliverable bounces */
+-    if (!msg->return_path[0] ||
++    if (!msg || !msg->return_path[0] || 
+ 	strcmp(msg->return_path, "<>") == 0 ||
+ 	strcasecmp(msg->return_path, md1) == 0 ||
+ 	strncasecmp(msg->return_path, md2, strlen(md2)) == 0)