diff --git a/xorg-x11-fonts.changes b/xorg-x11-fonts.changes
index ee4cf75..08adaff 100644
--- a/xorg-x11-fonts.changes
+++ b/xorg-x11-fonts.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Dec 13 17:00:35 CET 2007 - sndirsch@suse.de
+
+- mark fonts.dir/fonts.scale/encodings.dir as %config in filelist
+
 -------------------------------------------------------------------
 Sat Sep 29 12:22:18 CEST 2007 - sndirsch@suse.de
 
diff --git a/xorg-x11-fonts.spec b/xorg-x11-fonts.spec
index e2e5b38..bf89037 100644
--- a/xorg-x11-fonts.spec
+++ b/xorg-x11-fonts.spec
@@ -14,7 +14,7 @@ Name:           xorg-x11-fonts
 BuildRequires:  fontconfig freetype2 pkgconfig xorg-x11 xorg-x11-fonts-devel xorg-x11-libICE xorg-x11-libSM xorg-x11-libX11 xorg-x11-libXau xorg-x11-libXdmcp xorg-x11-libXext xorg-x11-libXfixes xorg-x11-libXmu xorg-x11-libXp xorg-x11-libXpm xorg-x11-libXprintUtil xorg-x11-libXrender xorg-x11-libXt xorg-x11-libXv xorg-x11-libfontenc xorg-x11-libs xorg-x11-libxkbfile xorg-x11-proto-devel
 Url:            http://xorg.freedesktop.org/
 Version:        7.3
-Release:        1
+Release:        22
 License:        X11/MIT
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -145,22 +145,52 @@ rm -rf "$RPM_BUILD_ROOT"
 
 %files 
 %defattr(-,root,root)
-/usr/share/fonts/100dpi/
+%dir /usr/share/fonts/100dpi
+%dir /usr/share/fonts/Speedo
+%dir /usr/share/fonts/Type1
+%dir /usr/share/fonts/cyrillic
+%dir /usr/share/fonts/truetype
+%config /usr/share/fonts/100dpi/fonts.dir
+%config /usr/share/fonts/100dpi/fonts.scale
+/usr/share/fonts/100dpi/fonts.alias
+/usr/share/fonts/100dpi/*.pcf.gz
 /usr/share/fonts/75dpi/fonts.alias
 /usr/share/fonts/75dpi/*-ISO8859-*.pcf.gz
-/usr/share/fonts/Speedo/
-/usr/share/fonts/Type1/
-/usr/share/fonts/cyrillic/
-/usr/share/fonts/truetype/
+%config /usr/share/fonts/Speedo/fonts.dir
+%config /usr/share/fonts/Speedo/fonts.scale
+/usr/share/fonts/Speedo/*.spd
+%config /usr/share/fonts/Type1/fonts.dir
+%config /usr/share/fonts/Type1/fonts.scale
+/usr/share/fonts/Type1/*.afm
+/usr/share/fonts/Type1/*.pfa
+/usr/share/fonts/Type1/*.pfb
+%config /usr/share/fonts/cyrillic/fonts.dir
+%config /usr/share/fonts/cyrillic/fonts.scale
+/usr/share/fonts/cyrillic/fonts.alias
+/usr/share/fonts/cyrillic/*.pcf.gz
+%config /usr/share/fonts/truetype/fonts.dir
+%config /usr/share/fonts/truetype/fonts.scale
+/usr/share/fonts/truetype/*.otf
+/usr/share/fonts/truetype/*.ttf
 
 %files core -f files.%{name}-core
 %defattr(-,root,root)
 %dir /usr/share/fonts/misc
 %dir /usr/share/fonts/75dpi
 %dir /usr/share/fonts/encodings
-/usr/share/fonts/encodings/*
-/usr/share/fonts/misc/*
+%dir /usr/share/fonts/encodings/large
+%config /usr/share/fonts/encodings/encodings.dir
+/usr/share/fonts/encodings/*.enc.gz
+%config /usr/share/fonts/encodings/large/encodings.dir
+/usr/share/fonts/encodings/large/*.enc.gz
+%config /usr/share/fonts/misc/fonts.dir
+%config /usr/share/fonts/misc/fonts.scale
+/usr/share/fonts/misc/fonts.alias
+/usr/share/fonts/misc/*.pcf.gz
+
 %changelog
+* Thu Dec 13 2007 - sndirsch@suse.de
+- mark fonts.dir/fonts.scale/encodings.dir as %%config in filelist
 * Sat Sep 29 2007 - sndirsch@suse.de
 - bumped version to 7.3
 * Tue Jul 24 2007 - sndirsch@suse.de