diff --git a/usermode.spec b/usermode.spec
index 5c57a3b..7e66651 100644
--- a/usermode.spec
+++ b/usermode.spec
@@ -5,7 +5,7 @@
 Summary: Tools for certain user account management tasks
 Name: usermode
 Version: 1.91
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/System
 Source: usermode-%{version}.tar.bz2
@@ -66,6 +66,22 @@ for wrappedapp in halt reboot poweroff ; do
 	cp shutdown.pamd $RPM_BUILD_ROOT/etc/pam.d/${wrappedapp}
 done
 
+for i in redhat-userinfo.desktop redhat-userpasswd.desktop; do
+  cat >>$RPM_BUILD_ROOT%{_datadir}/applications/$i <<EOF
+NoDisplay=true
+EOF
+  desktop-file-install --vendor redhat --delete-original    \
+    --dir $RPM_BUILD_ROOT%{_datadir}/applications           \
+    --remove-category Application			    \
+    --add-category X-GNOME-PersonalSettings		    \
+    $RPM_BUILD_ROOT%{_datadir}/applications/$i
+done
+  
+desktop-file-install --vendor redhat --delete-original       \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications              \
+  --remove-category Application				     \
+  $RPM_BUILD_ROOT%{_datadir}/applications/redhat-usermount.desktop
+
 %find_lang %{name}
 
 %clean
@@ -105,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/*
 
 %changelog
+* Tue Mar 27 2007 Matthias Clasen <mclasen@redhat.com> 1.91-2
+- Clean up desktop files
+
 * Mon Mar 19 2007 Miloslav Trmac <mitr@redhat.com> - 1.91-1
 - Preserve environment variables in consolehelper if specified in the service
   config file