diff --git a/audio/mpg123.el/Makefile b/audio/mpg123.el/Makefile
index b4c332bad6bb..2414742509a1 100644
--- a/audio/mpg123.el/Makefile
+++ b/audio/mpg123.el/Makefile
@@ -7,6 +7,7 @@ CATEGORIES=	audio elisp
 MASTER_SITES=	http://www.gentei.org/~yuuji/software/mpg123el/
 EXTRACT_SUFX=	# empty
 EXTRACT_ONLY=	# empty
+DISTFILES=	mpg123el.cgi?${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Front-end to mpg123/ogg123 audio player for Emacsen
@@ -20,16 +21,12 @@ NO_BUILD=	yes
 ELISPDIR=	${PREFIX}/share/emacs/site-lisp
 XELISPDIR=	${PREFIX}/lib/xemacs/site-lisp
 
-myFETCH_CMD=	${FETCH_CMD} -AR
-
-BROKEN=		fails to fetch
-
-do-fetch:
-	${myFETCH_CMD} ${FETCH_BEFORE_ARGS} ${MASTER_SITES}/mpg123el.cgi?${PORTVERSION}
+FETCH_ARGS=	-AR
+FETCH_BEFORE_ARGS=	-o mpg123el.cgi?${PORTVERSION}
 
 do-install:
 	${MKDIR} ${ELISPDIR}
-	${INSTALL_DATA} ${DISTDIR}/${DISTNAME} ${ELISPDIR}/${PORTNAME}
+	${INSTALL_DATA} ${DISTDIR}/mpg123el.cgi?${PORTVERSION} ${ELISPDIR}/${PORTNAME}
 # For XEmacs
 	${MKDIR} ${XELISPDIR}
 	${LN} -sf ${ELISPDIR}/${PORTNAME} ${XELISPDIR}/${PORTNAME}
diff --git a/audio/mpg123.el/distinfo b/audio/mpg123.el/distinfo
index e3a9be51c081..2fa7118c1d92 100644
--- a/audio/mpg123.el/distinfo
+++ b/audio/mpg123.el/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mpg123.el-1.52) = 408e163771949bc3eb0b9758b825fdd80f894381f9ecc1f0181f5668fc82a92f
-SIZE (mpg123.el-1.52) = 110508
+SHA256 (mpg123el.cgi?1.52) = 408e163771949bc3eb0b9758b825fdd80f894381f9ecc1f0181f5668fc82a92f
+SIZE (mpg123el.cgi?1.52) = 110508