diff --git a/CIDFnmap.ja b/CIDFnmap.ja
index 18b6c5f..1865f8d 100644
--- a/CIDFnmap.ja
+++ b/CIDFnmap.ja
@@ -45,9 +45,9 @@
 %	Kochi-Mincho: Public domain. Designed by Yasuyuki Furukawa.
 %	Kochi-Gothic: Wada Lab's font license.
 %
-/Sazanami-Mincho	(/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf) ;
-/Sazanami-Gothic	(/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf) ;
-/VL-Gothic		(/usr/share/fonts/VLGothic/VL-Gothic-Regular.ttf) ;
+/Sazanami-Mincho	(/usr/share/fonts/sazanami/mincho/sazanami-mincho.ttf) ;
+/Sazanami-Gothic	(/usr/share/fonts/sazanami/gothic/sazanami-gothic.ttf) ;
+/VL-Gothic		(/usr/share/fonts/vlgothic/VL-Gothic-Regular.ttf) ;
 
 /Adobe-Japan1		/Sazanami-Mincho	;
 /Adobe-Japan2		/VL-Gothic	;
diff --git a/FAPIcidfmap.ja b/FAPIcidfmap.ja
index 068c684..c4e5c58 100644
--- a/FAPIcidfmap.ja
+++ b/FAPIcidfmap.ja
@@ -22,12 +22,12 @@
 %
 % Use regular Postscript syntax.
 %
-/Sazanami-Mincho	<< /Path (/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan1) 6] >> ;
-/Sazanami-Gothic	<< /Path (/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan1) 6] >> ;
+/Sazanami-Mincho	<< /Path (/usr/share/fonts/sazanami/mincho/sazanami-mincho.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan1) 6] >> ;
+/Sazanami-Gothic	<< /Path (/usr/share/fonts/sazanami/gothic/sazanami-gothic.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan1) 6] >> ;
 /Kochi-Mincho		<< /Path (/usr/share/fonts/japanese/TrueType/kochi-mincho-subst.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan1) 6] >> ;
 /Kochi-Gothic		<< /Path (/usr/share/fonts/japanese/TrueType/kochi-gothic-subst.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan1) 6] >> ;
-/VL-Gothic		<< /Path (/usr/share/fonts/VLGothic/VL-Gothic-Regular.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan1) 6] >> ;
-/Adobe-Japan1		<< /Path (/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan1) 6] >> ;
-/Adobe-Japan2		<< /Path (/usr/share/fonts/VLGothic/VL-Gothic-Regular.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan2) 0] >> ;
-/Ryumin-Light		<< /Path (/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan1) 6] >> ;
-/GothicBBB-Medium	<< /Path (/usr/share/fonts/VLGothic/VL-Gothic-Regular.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan1) 6] >> ;
+/VL-Gothic		<< /Path (/usr/share/fonts/vlgothic/VL-Gothic-Regular.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan1) 6] >> ;
+/Adobe-Japan1		<< /Path (/usr/share/fonts/sazanami/mincho/sazanami-mincho.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan1) 6] >> ;
+/Adobe-Japan2		<< /Path (/usr/share/fonts/vlgothic/VL-Gothic-Regular.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan2) 0] >> ;
+/Ryumin-Light		<< /Path (/usr/share/fonts/sazanami/mincho/sazanami-mincho.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan1) 6] >> ;
+/GothicBBB-Medium	<< /Path (/usr/share/fonts/vlgothic/VL-Gothic-Regular.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan1) 6] >> ;
diff --git a/cidfmap.ja b/cidfmap.ja
index 7dcf113..6b57a8c 100644
--- a/cidfmap.ja
+++ b/cidfmap.ja
@@ -1,14 +1,14 @@
-/Sazanami-Gothic	<< /FileType /TrueType /Path (/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf) /CSI [(Japan1) 6] >> ;
+/Sazanami-Gothic	<< /FileType /TrueType /Path (/usr/share/fonts/sazanami/gothic/sazanami-gothic.ttf) /CSI [(Japan1) 6] >> ;
 /Sazanami-Gothic-Regular	/Sazanami-Gothic ;
-/Sazanami-Gothic-JaH	<< /FileType /TrueType /Path (/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf) /CSI [(Japan2) 0] >> ;
+/Sazanami-Gothic-JaH	<< /FileType /TrueType /Path (/usr/share/fonts/sazanami/gothic/sazanami-gothic.ttf) /CSI [(Japan2) 0] >> ;
 /Sazanami-Gothic-Regular-JaH	/Sazanami-Gothic-JaH ;
-/Sazanami-Mincho	<< /FileType /TrueType /Path (/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf) /CSI [(Japan1) 6] >> ;
+/Sazanami-Mincho	<< /FileType /TrueType /Path (/usr/share/fonts/sazanami/mincho/sazanami-mincho.ttf) /CSI [(Japan1) 6] >> ;
 /Sazanami-Mincho-Regular	/Sazanami-Mincho ;
-/Sazanami-Mincho-JaH	<< /FileType /TrueType /Path (/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf) /CSI [(Japan2) 0] >> ;
+/Sazanami-Mincho-JaH	<< /FileType /TrueType /Path (/usr/share/fonts/sazanami/mincho/sazanami-mincho.ttf) /CSI [(Japan2) 0] >> ;
 /Sazanami-Mincho-Regular-JaH	/Sazanami-Mincho-JaH ;
-/VL-Gothic		<< /FileType /TrueType /Path (/usr/share/fonts/VLGothic/VL-Gothic-Regular.ttf) /CSI [(Japan1) 6] >> ;
+/VL-Gothic		<< /FileType /TrueType /Path (/usr/share/fonts/vlgothic/VL-Gothic-Regular.ttf) /CSI [(Japan1) 6] >> ;
 /VL-Gothic-Regular		/VL-Gothic ;
-/VL-Gothic-JaH		<< /FileType /TrueType /Path (/usr/share/fonts/VLGothic/VL-Gothic-Regular.ttf) /CSI [(Japan1) 6] >> ;
+/VL-Gothic-JaH		<< /FileType /TrueType /Path (/usr/share/fonts/vlgothic/VL-Gothic-Regular.ttf) /CSI [(Japan1) 6] >> ;
 /VL-Gothic-Regular-JaH		/VL-Gothic-JaH ;
 /Ryumin-Light		/Sazanami-Mincho ;
 /GothicBBB-Medium	/VL-Gothic ;
diff --git a/japanese-bitmap-fonts.spec b/japanese-bitmap-fonts.spec
index 68549b8..d8122e0 100644
--- a/japanese-bitmap-fonts.spec
+++ b/japanese-bitmap-fonts.spec
@@ -15,7 +15,7 @@
 
 Name:           %{fontname}-fonts
 Version:        0.20080710
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        Public Domain and BSD and mplus
 Group:          User Interface/X
 BuildArch:      noarch
@@ -295,7 +295,7 @@ install -m 0644 -p jisksp14.pcf* $RPM_BUILD_ROOT%{_fontdir}/
 ## kappa20
 
 ## knm_new
-for i in knmhn12x.bdf fonts/kaname-latin1.bdf fonts/knm12p.bdf fonts/knm12pb.bdf fonts/knmzn12x.bdf fonts/knmzn12xb.bdf; do
+for i in knmhn12x.bdf knmzn12x.bdf; do
     bdftopcf $i | gzip -9 > $RPM_BUILD_ROOT%{_fontdir}/`basename $i | sed -e 's/.bdf/.pcf.gz/'`
 done
 
@@ -339,6 +339,10 @@ rm -rf $RPM_BUILD_ROOT
 %{cataloguedir}/*
 
 %changelog
+* Fri Jun 19 2009 Akira TAGOH <tagoh@redhat.com> - 0.20080710-6
+- Contains the correct fonts from kaname. (#505757)
+- Correct FAPIcidfmap.ja, cidfmap.ja and CIDFnmap.ja (#499634)
+
 * Fri Mar 27 2009 Akira TAGOH <tagoh@redhat.com> - 0.20080710-5
 - Clean up a spec file.
 - Rebuilt (#491963)