diff --git a/audio/cddb-bundle/Makefile b/audio/cddb-bundle/Makefile
index 44982961d1d5..7842d90b518d 100644
--- a/audio/cddb-bundle/Makefile
+++ b/audio/cddb-bundle/Makefile
@@ -7,23 +7,25 @@
 
 PORTNAME=	cddb
 PORTVERSION=	0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio gnustep
-MASTER_SITES=	SF/gsburn/${PORTNAME}.bundle/${PORTNAME}.bundle-${PORTVERSION}
+MASTER_SITES=	SF/gsburn/cdplayer/${DISTNAME}
 PKGNAMESUFFIX=	-bundle${PKGNAMESUFFIX2}
-DISTNAME=	cddb.bundle-${PORTVERSION}
+DISTNAME=	cdplayer-${CDPLAYER_VERSION}
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	CDDB client bundle GNUstep
 
 LICENSE=	GPLv2
 
+USE_BZIP2=	yes
 USE_GNUSTEP=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 
-WRKSRC=		${WRKDIR}/cddb.bundle
+CDPLAYER_VERSION=	0.5.1
+WRKSRC=		${WRKDIR}/CDPlayer-${CDPLAYER_VERSION}/Cddb
 MAKE_ENV+=	GNUSTEP_INSTALLATION_DIR=${GNUSTEP_LOCAL_ROOT}
 
 .include <bsd.port.mk>
diff --git a/audio/cddb-bundle/distinfo b/audio/cddb-bundle/distinfo
index e1c89d4654cf..3fbb74f970da 100644
--- a/audio/cddb-bundle/distinfo
+++ b/audio/cddb-bundle/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cddb.bundle-0.2.tar.gz) = 35801712b61d39d76a044cbcc30c727a31b3cffc0a3531b8a69e130bc07a051e
-SIZE (cddb.bundle-0.2.tar.gz) = 16936
+SHA256 (cdplayer-0.5.1.tar.bz2) = 70c048a3d9e0bf4176fb5d9bc221048a21b532a551908822632675b3c26796d9
+SIZE (cdplayer-0.5.1.tar.bz2) = 164244