diff --git a/editors/speedbar/Makefile b/editors/speedbar/Makefile
index 3b3d831ab014..de1add708b03 100644
--- a/editors/speedbar/Makefile
+++ b/editors/speedbar/Makefile
@@ -13,10 +13,11 @@ MASTER_SITE_SUBDIR=	cedet
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/beta/}
 
-MAINTAINER=	fuyuki@mj.0038.net
+MAINTAINER=	fuyuki@hadaly.org
 
 EMACS_PORT_NAME?=	emacs21
 
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 
 LISPDIR=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/speedbar
@@ -27,11 +28,11 @@ MUST_BE_RECOMPILED=	gud.el info.el rmail.el vhdl-mode.el
 
 EMACS_ARGS=	 -batch -l speedbar-compile-script -f batch-byte-compile
 
-pre-build:
+post-patch:
 .for i in ${MUST_BE_RECOMPILED}
 	${CP} `${FIND} ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/lisp -name ${i}` \
 		${WRKSRC}
-	${PERL} -pi -e 's/speedbar-attached-frame/dframe-attached-frame/' \
+	${REINPLACE_CMD} -e 's/speedbar-attached-frame/dframe-attached-frame/' \
 		${WRKSRC}/${i}
 .endfor
 
diff --git a/editors/speedbar/pkg-descr b/editors/speedbar/pkg-descr
index 86bd040f8b7f..aa8316e8c339 100644
--- a/editors/speedbar/pkg-descr
+++ b/editors/speedbar/pkg-descr
@@ -8,4 +8,4 @@ multiple directories into your speedbar frame.
 WWW: http://cedet.sourceforge.net/speedbar.shtml
 
 - Kimura Fuyuki
-fuyuki@mj.0038.net
+fuyuki@hadaly.org