diff --git a/mail/emh-xemacs21-mule/Makefile b/mail/emh-xemacs21-mule/Makefile
index 0e4d54d5d7a8..081cb6de0ce9 100644
--- a/mail/emh-xemacs21-mule/Makefile
+++ b/mail/emh-xemacs21-mule/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	emh (for xemacs21-mule)
-# Date Created:		12 Mar 2001
-# Whom:			Yoichi NAKAYAMA <yoichi@eken.phys.nagoya-u.ac.jp>
-#
+# Created by: Yoichi NAKAYAMA <yoichi@eken.phys.nagoya-u.ac.jp>
 # $FreeBSD$
-#
 
 MASTERDIR=	${.CURDIR}/../emh
 
diff --git a/mail/emh/Makefile b/mail/emh/Makefile
index 5ee281289042..2b0b15b7c981 100644
--- a/mail/emh/Makefile
+++ b/mail/emh/Makefile
@@ -1,24 +1,16 @@
-# New ports collection makefile for:	emh (for emacs21)
-# Date Created:		12 Mar 2001
-# Whom:			Yoichi NAKAYAMA <yoichi@eken.phys.nagoya-u.ac.jp>
-#
+# Created by: Yoichi NAKAYAMA <yoichi@eken.phys.nagoya-u.ac.jp>
 # $FreeBSD$
-#
 
 PORTNAME=	emh
 PORTVERSION=	1.14.1
 PORTREVISION=	13
 CATEGORIES=	mail elisp
-MASTER_SITES=	ftp://ring.aist.go.jp/pub/elisp/semi/semi-1.14-for-flim-1.14/ \
-		http://www.kanji.zinbun.kyoto-u.ac.jp/~tomo/lemi/dist/semi/semi-1.14-for-flim-1.14/
+MASTER_SITES=	RINGSERVER/elisp/semi/semi-1.14-for-flim-1.14
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MIME extension of mh-e.el
 
-DEPRECATED=	No more public distfiles
-EXPIRATION_DATE=	2012-10-20
-
 BUILD_DEPENDS+=	${LOCALBASE}/share/semi/${SEMI_COOKIE}:${PORTSDIR}/editors/semi${DEPPORT_SUFFIX}
 RUN_DEPENDS+=	${LOCALBASE}/share/semi/${SEMI_COOKIE}:${PORTSDIR}/editors/semi${DEPPORT_SUFFIX}