diff --git a/xsane.spec b/xsane.spec
index a5ee33f..d0fcba2 100644
--- a/xsane.spec
+++ b/xsane.spec
@@ -1,13 +1,14 @@
 Name: xsane
 Summary: An X Window System front-end for the SANE scanner interface.
 Version: 0.84
-Release: 5
+Release: 6
 Source: http://www.xsane.org/download/%{name}-%{version}.tar.gz
 License: GPL
 URL: http://www.xsane.org/
 Group: Applications/Multimedia
 Buildroot: %{_tmppath}/%{name}-buildroot
 BuildPrereq: sane-backends-devel gimp-devel libpng-devel libjpeg-devel
+BuildRequires: desktop-file-utils >= 0.2.92
 ExcludeArch: s390 s390x
 
 %description
@@ -49,16 +50,25 @@ install src/xsane-gimp %{buildroot}%{_bindir}
 
 mkdir -p %{buildroot}/etc/X11/applnk/Graphics
 
-cat > %{buildroot}/etc/X11/applnk/Graphics/xsane.desktop <<EOF
+cat > xsane.desktop <<EOF
 [Desktop Entry]
-Name=XSane
+Encoding=UTF-8
+Name=Scanning
 Name[sv]=XSane
+Comment=XSane
 Type=Application
 Description=A GIMP plugin which provides a scanner interface.
 Description[sv]=Ett GIMP-insticksprogram som erbjuder ett bildläsargränssnitt.
 Exec=xsane
 Icon=/usr/share/pixmaps/sane.png
 EOF
+mkdir $RPM_BUILD_ROOT%{_datadir}/applications
+desktop-file-install --vendor net --delete-original \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications        \
+  --add-category X-Red-Hat-Base                        \
+  --add-category Graphics                              \
+  --add-category Application                           \
+  xsane.desktop
 
 
 %clean
@@ -67,7 +77,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc xsane.[A-Z]*
-%config(missingok) /etc/X11/applnk/Graphics/xsane.desktop
+%{_datadir}/applications/*
 %{_bindir}/xsane
 %{_mandir}/man1/*
 %{_datadir}/sane
@@ -96,7 +106,13 @@ if [ $1 = 0 ]; then
 fi
 
 %changelog
-* Fri Jun 21 2002 Tim Powers <timp@redhat.com>
+* Tue Jul 23 2002 Tim Waugh <twaugh@redhat.com> 0.84-7
+- Desktop file fixes (bug #69555).
+
+* Mon Jul 15 2002 Tim Waugh <twaugh@redhat.com> 0.84-6
+- Use desktop-file-install.
+
+* Fri Jun 21 2002 Tim Powers <timp@redhat.com> 0.84-5
 - automated rebuild
 
 * Wed Jun 12 2002 Tim Waugh <twaugh@redhat.com> 0.84-4