diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index 2621b0543e01..6fe3ca47e6e0 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qpopper
 PORTVERSION=	4.0.7
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.qualcomm.com/eudora/servers/unix/popper/ \
 		http://core.ring.gr.jp/archives/net/mail/qpopper/
@@ -65,9 +66,9 @@ WITHOUT_IPV6=	yes
 .endif
 
 .if !defined(WITHOUT_IPV6)
-PATCH_SITES=	http://home.tiscali.cz:8080/~cz210552/bsdports/tarballs/
-PATCHFILES=	qpopper4.0.7-inet6-20030313.diff.gz
-PATCH_DIST_STRIP=	-p2
+PATCH_SITES=	http://www.imasy.or.jp/~ume/ipv6/
+PATCHFILES=	qpopper4.0.7-ipv6-20050427.diff.gz
+PATCH_DIST_STRIP=	-p1
 .endif
 
 .if defined(WITHOUT_APOP)
diff --git a/mail/qpopper/distinfo b/mail/qpopper/distinfo
index 63ab98c8e1a9..2587cea94a74 100644
--- a/mail/qpopper/distinfo
+++ b/mail/qpopper/distinfo
@@ -1,4 +1,4 @@
 MD5 (qpopper4.0.7.tar.gz) = c9e818cfca00cc196d4b883804f8c905
 SIZE (qpopper4.0.7.tar.gz) = 2350782
-MD5 (qpopper4.0.7-inet6-20030313.diff.gz) = 78d67bc88491219b83d1b4d323801a49
-SIZE (qpopper4.0.7-inet6-20030313.diff.gz) = 9015
+MD5 (qpopper4.0.7-ipv6-20050427.diff.gz) = 2da21925714528a25fe5bf67ddb848fa
+SIZE (qpopper4.0.7-ipv6-20050427.diff.gz) = 11450