diff --git a/audio/py-ao/Makefile b/audio/py-ao/Makefile
index fc1a717ece2..e40eff60d27 100644
--- a/audio/py-ao/Makefile
+++ b/audio/py-ao/Makefile
@@ -1,15 +1,13 @@
-# $OpenBSD: Makefile,v 1.4 2006/08/01 12:13:28 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2006/09/20 09:00:16 xsa Exp $
 
 NOT_FOR_ARCHS=	${NO_SHARED_ARCHS}
 
 COMMENT=	"Python wrapper module for the ao library"
 
 DISTNAME=	pyao-0.82
-PKGNAME=	${DISTNAME:S/py/py-/}p0
+PKGNAME=	${DISTNAME:S/py/py-/}p1
 CATEGORIES=	audio
-HOMEPAGE=	http://www.andrewchatham.com/pyogg/
-
-MAINTAINER=	Xavier Santolaria <xsa@openbsd.org>
+HOMEPAGE=	http://ekyo.nerim.net/software/pyogg/
 
 # GPL 
 PERMIT_PACKAGE_CDROM=	Yes
@@ -17,7 +15,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=	${HOMEPAGE}download/
+MASTER_SITES=	${HOMEPAGE}
 
 MODULES=	lang/python
 
diff --git a/audio/py-ogg/Makefile b/audio/py-ogg/Makefile
index 39473bebdf3..3924d4c2089 100644
--- a/audio/py-ogg/Makefile
+++ b/audio/py-ogg/Makefile
@@ -1,15 +1,13 @@
-# $OpenBSD: Makefile,v 1.7 2006/08/01 12:13:28 espie Exp $
+# $OpenBSD: Makefile,v 1.8 2006/09/20 08:57:29 xsa Exp $
 
 NOT_FOR_ARCHS=	${NO_SHARED_ARCHS}
 
 COMMENT=	"Python wrapper for the Ogg libraries"
 
 DISTNAME=	pyogg-1.3
-PKGNAME=	${DISTNAME:S/py/py-/}p0
+PKGNAME=	${DISTNAME:S/py/py-/}p1
 CATEGORIES=	audio
-HOMEPAGE=	http://www.andrewchatham.com/pyogg/
-
-MAINTAINER=	Xavier Santolaria <xsa@openbsd.org>
+HOMEPAGE=	http://ekyo.nerim.net/software/pyogg/
 
 # LGPL 
 PERMIT_PACKAGE_CDROM=	Yes
@@ -17,7 +15,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=	${HOMEPAGE}download/
+MASTER_SITES=	${HOMEPAGE}
 
 MODULES=	lang/python