diff --git a/net/jabberd/Makefile b/net/jabberd/Makefile
index 7a2a02e9ab3..df2bf03d760 100644
--- a/net/jabberd/Makefile
+++ b/net/jabberd/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.9 2005/03/17 17:12:44 naddy Exp $
+# $OpenBSD: Makefile,v 1.10 2005/03/17 17:32:24 naddy Exp $
 
 COMMENT=		"jabber server"
-DISTNAME=		jabberd-2.0s6
+DISTNAME=		jabberd-2.0s4
+PKGNAME=		${DISTNAME}p0
 CATEGORIES=		net
 HOMEPAGE=		http://jabberd.jabberstudio.org/2/
 MAINTAINER=		Gerardo Santana Gomez Garrido <santana@openbsd.org.mx>
@@ -13,7 +14,7 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		c crypto m ssl z
 
-MASTER_SITES=		http://files.jabberstudio.org/jabberd2/
+MASTER_SITES=		http://www.jabberstudio.org/files/jabberd2/
 
 JABBERDUSER=		_jabberd
 JABBERDGROUP=		_jabberd
diff --git a/net/jabberd/distinfo b/net/jabberd/distinfo
index e0b95cd5726..be9c17efdbd 100644
--- a/net/jabberd/distinfo
+++ b/net/jabberd/distinfo
@@ -1,4 +1,4 @@
-MD5 (jabberd-2.0s6.tar.gz) = ca2818885e126181e002949c71603df3
-RMD160 (jabberd-2.0s6.tar.gz) = 01a2596582eb647907e779e99eaef2ec778cc5d4
-SHA1 (jabberd-2.0s6.tar.gz) = 10a160e804e3ace8f7f39174db6bfaabe50211f0
-SIZE (jabberd-2.0s6.tar.gz) = 724448
+MD5 (jabberd-2.0s4.tar.gz) = 2682037fc177e1f3e7d7869cb3f59c1d
+RMD160 (jabberd-2.0s4.tar.gz) = 985c13e51b264f6c1e6d2c95de05ecc70d826848
+SHA1 (jabberd-2.0s4.tar.gz) = cb429db090982118f2b448499635ff14b91718b8
+SIZE (jabberd-2.0s4.tar.gz) = 716819