diff --git a/lash-panel.desktop b/lash-panel.desktop
new file mode 100644
index 0000000..c147008
--- /dev/null
+++ b/lash-panel.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=LASH Panel
+GenericName=LASH Control Panel
+Comment=LASH Control Panel
+Icon=lash
+Exec=lash_panel
+Terminal=false
+Type=Application
+Categories=AudioVideo;X-Lash;X-Jack;X-AudioVideoTools;
diff --git a/lash.spec b/lash.spec
index 5a8a1a7..dc84935 100644
--- a/lash.spec
+++ b/lash.spec
@@ -3,11 +3,12 @@
 Summary:      LASH Audio Session Handler
 Name:         lash
 Version:      0.5.4
-Release:      7%{?dist}
+Release:      8%{?dist}
 License:      GPLv2+
 Group:        System Environment/Libraries
 URL:          http://www.nongnu.org/lash/
 Source0:      http://download.savannah.gnu.org/releases/lash/lash-%{version}.tar.gz
+Source1:      %{name}-panel.desktop
 Patch0:       lash-0.5.3-no-static-lib.patch
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -21,7 +22,7 @@ BuildRequires: readline-devel
 BuildRequires: swig
 BuildRequires: texi2html
 
-%if 0%{?fedora} < 11
+%if 0%{?fedora} < 12
 BuildRequires: e2fsprogs-devel
 %else
 BuildRequires: libuuid-devel
@@ -41,7 +42,7 @@ Requires:     alsa-lib-devel
 Requires:     jack-audio-connection-kit-devel
 Requires:     pkgconfig
 
-%if 0%{?fedora} < 11
+%if 0%{?fedora} < 12
 Requires:     e2fsprogs-devel
 %else
 Requires:     libuuid-devel
@@ -102,22 +103,10 @@ mv %{buildroot}%{_datadir}/lash/dtds/lash-project-1.0.dtd %{buildroot}%{_datadir
 rm -rf %{buildroot}%{_datadir}/lash
 
 # install the desktop entry
-cat << EOF > %{name}-panel.desktop
-[Desktop Entry]
-Name=LASH Panel
-GenericName=LASH Control Panel
-Comment=LASH Control Panel
-Icon=lash.png
-Exec=%{_bindir}/lash_panel
-Terminal=false
-Type=Application
-EOF
 mkdir -p %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor fedora              \
+desktop-file-install --vendor fedora         \
   --dir %{buildroot}%{_datadir}/applications \
-  --add-category X-Fedora                         \
-  --add-category AudioVideo                       \
-  lash-panel.desktop
+  %{SOURCE1}
 
 # Work around the newer texi2html which is behaving somehow else
 if [ ! -d docs/lash-manual-html-split/lash-manual/ ]; then
@@ -171,6 +160,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{python_sitearch}/lash.py*
 
 %changelog
+* Wed Aug 05 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.5.4-8
+- Update .desktop file
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild