diff --git a/net/bitlbee/Makefile b/net/bitlbee/Makefile
index cf315f428ab..9c24cd050c1 100644
--- a/net/bitlbee/Makefile
+++ b/net/bitlbee/Makefile
@@ -1,10 +1,12 @@
-# $OpenBSD: Makefile,v 1.3 2003/06/28 07:38:29 sturm Exp $
-COMMENT=		"IRC-proxy to connect to icq, aol, msn and jabber"
+# $OpenBSD: Makefile,v 1.4 2003/10/08 22:16:49 naddy Exp $
+
+COMMENT=		"IRC proxy to connect to ICQ, AOL, MSN and Jabber"
 
 DISTNAME=		bitlbee-0.80
 CATEGORIES=		net
+PKGNAME=		${DISTNAME}p1
 
-HOMEPAGE=		http://www.lintux.cx/bitlbee.html
+HOMEPAGE=		http://bitlbee.org
 
 MAINTAINER=		Han Boetes <han@linux-mandrake.com>
 
@@ -14,7 +16,11 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=		http://www.lintux.cx/downloads/
+
+MASTER_SITES=		http://get.bitlbee.org/src/
+MASTER_SITES0=		http://get.bitlbee.org/patches/
+PATCHFILES=		yahoo.diff:0
+PATCH_DIST_STRIP=	-p1
 
 DB_DIR?=		/var/bitlbee
 DOCS=			${FILESDIR}/user-guide.html
diff --git a/net/bitlbee/distinfo b/net/bitlbee/distinfo
index 962f75a7e07..349da216b15 100644
--- a/net/bitlbee/distinfo
+++ b/net/bitlbee/distinfo
@@ -1,3 +1,6 @@
 MD5 (bitlbee-0.80.tar.gz) = 96d947bef8c6c40c865beaeee59737eb
+MD5 (yahoo.diff) = 6668146d14da88ef8240b49671db3e9b
 RMD160 (bitlbee-0.80.tar.gz) = 816ce7ae1152c151e4f611dab05e4e8182d2b2ec
+RMD160 (yahoo.diff) = cba9ee58f9846155f4566156eb3861622f875140
 SHA1 (bitlbee-0.80.tar.gz) = 5d02e6013ec42df3f5b495d9884c1f391be154f3
+SHA1 (yahoo.diff) = a94e2c4d7279351ed79c6735e3dd5bd3b7e0160d