diff --git a/make/common/Defs-linux.gmk b/make/common/Defs-linux.gmk
index fcaad70af32c98d7f5c4662081285a76342496ef..ee2f8ca43a4720f4668adb3aa092a1ad9ba82bd2 100644
--- a/make/common/Defs-linux.gmk
+++ b/make/common/Defs-linux.gmk
@@ -355,7 +355,7 @@ HAVE_DPS = no
 # Japanese manpages
 #
 JA_SOURCE_ENCODING = eucJP
-JA_TARGET_ENCODINGS = eucJP
+JA_TARGET_ENCODINGS = UTF-8
 
 # Settings for the JDI - Serviceability Agent binding.
 HOTSPOT_SALIB_PATH   = $(HOTSPOT_IMPORT_PATH)/jre/lib/$(LIBARCH)
diff --git a/make/common/Release.gmk b/make/common/Release.gmk
index 17297d573b04613a6f6c585864f7d8a00f50e952..defc145301852c84a4893ac9da15f1fad742ad44 100644
--- a/make/common/Release.gmk
+++ b/make/common/Release.gmk
@@ -164,7 +164,7 @@ endif # solaris
 ifeq ($(PLATFORM), linux)
   MANBASEDIRS=$(JDK_TOPDIR)/src/linux/doc $(IMPORTDOCDIR)
   MAN1SUBDIR=man
-  JA_DIRNAME=ja_JP.$(JA_SOURCE_ENCODING)
+  JA_DIRNAME=ja_JP.UTF-8
 endif # linux
 
 define copy-man-pages
@@ -190,8 +190,7 @@ for manbase in $(MANBASEDIRS:%=%/$(MAN1SUBDIR)) ; do \
 done
 $(java-vm-cleanup)
 if [ "$(JA_DIRNAME)" != "" ] ; then \
-  $(MV) $1/man/ja $1/man/$(JA_DIRNAME); \
-  $(CD) $1/man && $(LN) -s $(JA_DIRNAME) ja; \
+  $(CD) $1/man && $(RM) ja && $(LN) -s $(JA_DIRNAME) ja; \
 fi
 endef