diff --git a/xorg-x11-fonts.spec b/xorg-x11-fonts.spec
index 73751e6..64eeb06 100644
--- a/xorg-x11-fonts.spec
+++ b/xorg-x11-fonts.spec
@@ -30,7 +30,7 @@
 Summary:	X.Org X11 fonts
 Name:		xorg-x11-fonts
 Version:	0.99.0
-Release:	6
+Release:	7
 License:	Various licenses
 Group:		User Interface/X
 URL:		http://www.x.org
@@ -478,12 +478,14 @@ done
   FONTDIR=%{_x11fontdir}/misc
   mkfontdir $FONTDIR 
   # NOTE: We add the ":unscaled" suffix to avoid ugly bitmap fonts.
-  # FIXME: we don't because of #172997
-  /usr/sbin/chkfontpath -qa %{_x11fontdir}/misc
+  /usr/sbin/chkfontpath -qa %{_x11fontdir}/misc:unscaled
   # FIXME: This should only be done on upgrades.
   # Remove the Speedo directory from xfs config as X.Org no longer provides
   # Speedo font support.
   /usr/sbin/chkfontpath -qr %{_x11fontdir}/Speedo
+  # NOTE: Remove the non :unscaled version of misc font directory from
+  # configuration to undo a temporary workaround that was added in 0.99.0-5
+  /usr/sbin/chkfontpath -qr %{_x11fontdir}/misc
   fc-cache $FONTDIR
 }
 # &> /dev/null || :
@@ -1438,6 +1440,12 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %verify(not md5 size mtime) %{_x11fontdir}/cyrillic/fonts.cache-*
 
 %changelog
+* Wed Nov 22 2005 Mike A. Harris <mharris@redhat.com> 0.99.0-7
+- Undo the workaround implemented in build 0.99.0-5, and make the misc fonts
+  directory ":unscaled" again.
+- Invoke chkfontpath to remove the bare 'misc' font path without the :unscaled
+  attribute from xfs config.
+
 * Mon Nov 14 2005 Mike A. Harris <mharris@redhat.com> 0.99.0-6
 - Fixed mkfontscale invocation in Type1 font subpackage post/postun scripts
   by removing accidental -o argument that creeped in via cut and paste