diff --git a/archivers/deepforest/Makefile b/archivers/deepforest/Makefile
index 6d9a2cb44785..3712d3a28679 100644
--- a/archivers/deepforest/Makefile
+++ b/archivers/deepforest/Makefile
@@ -8,13 +8,13 @@
 PORTNAME=	deepforest
 PORTVERSION=	1.0a
 CATEGORIES=	${CATEGORY_LIST}
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-# http://www.aaa-int.or.jp/~jfactory/JDE/dist/
-MASTER_SITE_SUBDIR=	trevor
+MASTER_SITES=	http://www.aaa-int.or.jp/~jfactory/JDE/dist/ \
+		${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	. kiri
 DISTNAME=	DeepForest-${PORTVERSION}
 EXTRACT_ONLY=	# extracted directly in install target
 
-MAINTAINER=	kiri@pis.toba-cmt.ac.jp
+MAINTAINER=	kiri@FreeBSD.org
 COMMENT=	A simple compress utilty using on JDE
 
 RUN_DEPENDS=	${RUN_DEP_LIST}
@@ -23,7 +23,9 @@ LIB_DEPENDS=	${LIB_DEP_LIST}
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 USE_X_PREFIX=	yes
-SCRIPTS_ENV=	LANG=C LN=${LN} PERL=${PERL} LANGUAGE=${LANGUAGE} VERSION=${TKSTEPVERSION}
+USE_REINPLACE=	yes
+SCRIPTS_ENV=	LANG=C LN=${LN} REINPLACE_CMD="${REINPLACE_CMD}" \
+		LANGUAGE=${LANGUAGE} VERSION=${TKSTEPVERSION}
 PLIST_SUB=	PIXMAP_PATH=${PIXMAPPATH:S@^${PREFIX}/@@}
 
 # This port is for both archivers/deepforest and japanese/deepforest.
diff --git a/archivers/deepforest/pkg-descr b/archivers/deepforest/pkg-descr
index 4106bef6d532..baa4f8601b50 100644
--- a/archivers/deepforest/pkg-descr
+++ b/archivers/deepforest/pkg-descr
@@ -4,4 +4,4 @@ Note that both converters/deepforest and japanese/deepforest are mutually
 exclusive and SHOULD NOT BE INSTALLED SIMULTANEOUSLY!
 
 -KIRIYAMA Kazuhiko
-<kiri@pis.toba-cmt.ac.jp>
+<kiri@FreeBSD.org>
diff --git a/archivers/deepforest/pkg-plist b/archivers/deepforest/pkg-plist
index f72ddaf5b7bf..66c6f2b5abb7 100644
--- a/archivers/deepforest/pkg-plist
+++ b/archivers/deepforest/pkg-plist
@@ -14,3 +14,4 @@ bin/DeepForest.app
 @dirrm JDE/DeepForest/docs/Japanese
 @dirrm JDE/DeepForest/docs
 @dirrm JDE/DeepForest
+@unexec rmdir %D/JDE 2>/dev/null || true
diff --git a/archivers/deepforest/scripts/post-install b/archivers/deepforest/scripts/post-install
index aa14facb24c5..06d9aad764ce 100644
--- a/archivers/deepforest/scripts/post-install
+++ b/archivers/deepforest/scripts/post-install
@@ -3,9 +3,9 @@
 case ${LANGUAGE} in
     Japanese)
 	for f in DeepForest.app; do
-	    ${PERL} -pi -e '
-		s/^(exec[ \t]+)wishstep[^ \t]*([ \t]+.*)$/$1wishstep$ENV{VERSION}jp$2/
-		' ${PREFIX}/JDE/DeepForest/${f}
+	    ${REINPLACE_CMD} -E -e \
+	    	"s/^(exec[[:space:]]+)wishstep[^[:space:]]*([[:space:]]+.*)\$/\1wishstep${VERSION}jp\2/" \
+		${PREFIX}/JDE/DeepForest/${f}
 	done
     ;;
     *)