diff --git a/japanese/nkf/Makefile b/japanese/nkf/Makefile
index 252f40542353..62ff1ca3e268 100644
--- a/japanese/nkf/Makefile
+++ b/japanese/nkf/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	nkf
 PORTVERSION=	2.1.5
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES?=	japanese
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Network Kanji code conversion Filter
 
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/nkf.c
 
 USES=		iconv
 USE_GITHUB=	yes
 GH_ACCOUNT=	nurse
 GH_TAGNAME=	v${PORTVERSION:C/\./_/g}
 
 MAKE_ENV=	MKDIR="${MKDIR}" \
 		ICONV_CMD="${ICONV_CMD}"
-PLIST_FILES=	bin/nkf man/man1/nkf.1.gz man/ja.UTF-8/man1/nkf.1.gz
+PLIST_FILES=	bin/nkf share/man/man1/nkf.1.gz share/man/ja/man1/nkf.1.gz
 
 .include <bsd.port.mk>
diff --git a/japanese/nkf/files/patch-Makefile b/japanese/nkf/files/patch-Makefile
index dc419584d000..30da909591b9 100644
--- a/japanese/nkf/files/patch-Makefile
+++ b/japanese/nkf/files/patch-Makefile
@@ -1,60 +1,60 @@
 --- Makefile.orig	2018-12-15 09:19:02 UTC
 +++ Makefile
 @@ -1,18 +1,24 @@
 -CC = cc
 -CFLAGS = -g -O2 -Wall -pedantic
 +CC ?= cc
 +CFLAGS ?= -g -O2 -Wall -pedantic
  # CFLAGS = -O3
  SHAR = shar 
  # SHAR = shar -T
  PERL = perl
  RM = rm -rf
  VERSION = 2.1.5
 -MKDIR = mkdir
 -prefix = /usr/local
 +MKDIR ?= mkdir
 +prefix = $(DESTDIR)$(PREFIX)
-+manprefix = $(DESTDIR)$(MANPREFIX)
++manprefix = $(DESTDIR)$(PREFIX)/share
  PYTHON2 = python
  PYTHON3 = python
 +BSD_INSTALL_PROGRAM?= ${INSTALL} -s -o root -g wheel -m 555
 +BSD_INSTALL_MAN?= ${INSTALL}    -o root -g wheel -m 444
 +ICONV_CMD?=	iconv
  
  .PHONY: clean install test tar shar
  
 +all: nkf
 +
  nkf : nkf.o utf8tbl.o
  	$(CC) $(CFLAGS) $(LDFLAGS) -o nkf nkf.o utf8tbl.o
  
 @@ -47,17 +53,20 @@ install-main:
  
  install-main:
  	-$(MKDIR) $(prefix)/bin
 -	cp -f nkf $(prefix)/bin/
 +	${BSD_INSTALL_PROGRAM} nkf $(prefix)/bin/
  
  install-man:
 -	-$(MKDIR) $(prefix)/man
 -	-$(MKDIR) $(prefix)/man/man1
 -	cp -f nkf.1 $(prefix)/man/man1/
 +	-$(MKDIR) $(manprefix)/man
 +	-$(MKDIR) $(manprefix)/man/man1
 +	${BSD_INSTALL_MAN} nkf.1 $(manprefix)/man/man1/
  
 -install-man-ja:
 -	-$(MKDIR) $(prefix)/man/ja
 -	-$(MKDIR) $(prefix)/man/ja/man1
 -	cp -f nkf.1j $(prefix)/man/ja/man1/nkf.1
 +nkf.1u: nkf.1j
 +	${ICONV_CMD} -f iso-2022-jp -t utf-8 < $? > $@
 +
 +install-man-ja: nkf.1u
-+	-$(MKDIR) $(manprefix)/man/ja.UTF-8
-+	-$(MKDIR) $(manprefix)/man/ja.UTF-8/man1
-+	${BSD_INSTALL_MAN} nkf.1u $(manprefix)/man/ja.UTF-8/man1/nkf.1
++	-$(MKDIR) $(manprefix)/man/ja
++	-$(MKDIR) $(manprefix)/man/ja/man1
++	${BSD_INSTALL_MAN} nkf.1u $(manprefix)/man/ja/man1/nkf.1
  
  shar:
  	-mkdir nkf-$(VERSION)