diff --git a/.cvsignore b/.cvsignore
index 2577c38..77ed6e0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-usermode-1.91.2.tar.bz2
+usermode-1.92.tar.bz2
diff --git a/sources b/sources
index 224cd6b..877d938 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-84abb408057912b710bf51aea5bc59ce  usermode-1.91.2.tar.bz2
+6b962175592a2b4668b7251fa18d97f4  usermode-1.92.tar.bz2
diff --git a/usermode.spec b/usermode.spec
index d250f49..de1a36a 100644
--- a/usermode.spec
+++ b/usermode.spec
@@ -4,7 +4,7 @@
 
 Summary: Tools for certain user account management tasks
 Name: usermode
-Version: 1.91.2
+Version: 1.92
 Release: 1
 License: GPL
 Group: Applications/System
@@ -67,20 +67,15 @@ for wrappedapp in halt reboot poweroff ; do
 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
+  echo 'NoDisplay=true' >>$RPM_BUILD_ROOT%{_datadir}/applications/$i
+done
+
+for i in redhat-userinfo.desktop redhat-userpasswd.desktop \
+	redhat-usermount.desktop; do
+	desktop-file-install --vendor redhat --delete-original \
+		--dir $RPM_BUILD_ROOT%{_datadir}/applications \
+		$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}
 
@@ -121,6 +116,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/*
 
 %changelog
+* Mon Jun 11 2007 Miloslav Trmač <mitr@redhat.com> - 1.92-1
+- Fix userhelper hangs in non-UTF8 locales
+  Resolves: #242420
+- Clean up menu categories in desktop files
+
 * Sat Jun  9 2007 Miloslav Trmač <mitr@redhat.com> - 1.91.2-1
 - Show the user we're authenticating as in an i18n-safe way.
   Resolves: #233210