diff --git a/japanese-bitmap-fonts.spec b/japanese-bitmap-fonts.spec
index 98c8682..d4404e0 100644
--- a/japanese-bitmap-fonts.spec
+++ b/japanese-bitmap-fonts.spec
@@ -125,7 +125,7 @@ bdftopcf jisksp14.bdf | gzip -9 > jisksp14.pcf.gz
 ## kappa20
 ## fonts-ja
 pushd %{shinonome}-src
-%configure --disable-bold --disable-italic --with-fontdir=$RPM_BUILD_ROOT%{bmpfontdir}
+%configure --disable-bold --disable-italic --with-fontdir=$RPM_BUILD_ROOT%{fontdir}
 make bdf
 popd
 ### rename Kappa and remove the bold fonts
@@ -286,24 +286,24 @@ popd
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT%{bmpfontdir}
+install -d $RPM_BUILD_ROOT%{fontdir}
 install -d $RPM_BUILD_ROOT%{cidmapdir}
 
 ## jisksp14
-install -m 0644 -p jisksp14.pcf* $RPM_BUILD_ROOT%{bmpfontdir}/
+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
-    bdftopcf $i | gzip -9 > $RPM_BUILD_ROOT%{bmpfontdir}/`basename $i | sed -e 's/.bdf/.pcf.gz/'`
+    bdftopcf $i | gzip -9 > $RPM_BUILD_ROOT%{fontdir}/`basename $i | sed -e 's/.bdf/.pcf.gz/'`
 done
 
 ## fonts-ja
 ### remove an unnecessary file
 rm -f fonts-ja/mplus_cursors.pcf.gz
 for i in fonts-ja/*.pcf.gz; do
-    install -m 0644 -p $i $RPM_BUILD_ROOT%{bmpfontdir}/`basename $i`
+    install -m 0644 -p $i $RPM_BUILD_ROOT%{fontdir}/`basename $i`
 done
 
 # for ghostscript
@@ -312,17 +312,15 @@ install -m 0644 -p %{SOURCE3} $RPM_BUILD_ROOT%{cidmapdir}/
 install -m 0644 -p %{SOURCE4} $RPM_BUILD_ROOT%{cidmapdir}/
 
 # Create fonts.scale and fonts.dir
-/usr/bin/mkfontdir $RPM_BUILD_ROOT%{bmpfontdir}
+/usr/bin/mkfontdir $RPM_BUILD_ROOT%{fontdir}
 # for dummy
-touch $RPM_BUILD_ROOT%{basefontdir}/fonts.cache-1
-touch $RPM_BUILD_ROOT%{bmpfontdir}/fonts.cache-1
-touch $RPM_BUILD_ROOT%{bmpfontdir}/encodings.dir
+touch $RPM_BUILD_ROOT%{fontdir}/encodings.dir
 
-install -m 0644 -p fonts-ja/fonts.alias $RPM_BUILD_ROOT%{bmpfontdir}/
+install -m 0644 -p fonts-ja/fonts.alias $RPM_BUILD_ROOT%{fontdir}/
 
 # Install catalogue symlink
-install -d $RPM_BUILD_ROOT%{catalogue}
-ln -sf %{bmpfontdir} $RPM_BUILD_ROOT%{catalogue}/%{name}
+install -d $RPM_BUILD_ROOT%{cataloguedir}
+ln -sf %{fontdir} $RPM_BUILD_ROOT%{cataloguedir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -347,14 +345,14 @@ fi
 %doc fonts-ja/COPYRIGHT* fonts-ja/README* fonts-ja/LICENSE* fonts-ja/ALLFONTS.txt
 %dir %{fontdir}
 %dir %{cidmapdir}
-%verify(not md5 size mtime) %{bmpfontdir}/fonts.alias
-%verify(not md5 size mtime) %{bmpfontdir}/fonts.dir
-%ghost %verify(not md5 size mtime) %{bmpfontdir}/encodings.dir
+%verify(not md5 size mtime) %{fontdir}/fonts.alias
+%verify(not md5 size mtime) %{fontdir}/fonts.dir
+%ghost %verify(not md5 size mtime) %{fontdir}/encodings.dir
 %{fontdir}/*gz
 %{cidmapdir}/FAPIcidfmap.ja
 %{cidmapdir}/cidfmap.ja
 %{cidmapdir}/CIDFnmap.ja
-%{catalogue}/*
+%{cataloguedir}/*
 
 %changelog
 * Thu Jul 10 2008 Akira TAGOH <tagoh@redhat.com> - 0.20080710-1