diff --git a/japanese/weather-emacs20/Makefile b/japanese/weather-emacs20/Makefile
index 27144b6ae243..f5734714f787 100644
--- a/japanese/weather-emacs20/Makefile
+++ b/japanese/weather-emacs20/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	weather
-PORTVERSION=	0.28
+PORTVERSION=	0.29
 CATEGORIES=	japanese elisp
 MASTER_SITES=	ftp://ftp.opaopa.org/pub/elisp/ \
 		ftp://ftp.ring.gr.jp/pub/text/elisp/jaist/ftp.opaopa.org/elisp/ \
@@ -15,11 +15,15 @@ PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER=	yoichi@FreeBSD.org
 
-BUILD_DEPENDS=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/emu/emu.el:${PORTSDIR}/editors/apel-emacs20
-RUN_DEPENDS=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/emu/emu.el:${PORTSDIR}/editors/apel-emacs20
-
 EMACS_PORT_NAME?=	emacs20
 
+.if ${EMACS_PORT_NAME} != "emacs21"
+PORTNAMESUFFIX=	${PKGNAMESUFFIX}
+.endif
+
+BUILD_DEPENDS=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/emu/emu.el:${PORTSDIR}/editors/apel${PORTNAMESUFFIX}
+RUN_DEPENDS=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/emu/emu.el:${PORTSDIR}/editors/apel${PORTNAMESUFFIX}
+
 DOCS=		README
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}
diff --git a/japanese/weather-emacs20/distinfo b/japanese/weather-emacs20/distinfo
index 8ba878854435..52d3aca80412 100644
--- a/japanese/weather-emacs20/distinfo
+++ b/japanese/weather-emacs20/distinfo
@@ -1 +1 @@
-MD5 (weather-0.28.tar.gz) = 5cd6270c5a177fc389818456a1c49437
+MD5 (weather-0.29.tar.gz) = 0a46e78440c4d735dff6c04caa8d824c