diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 0244043..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-usermode-1.91.1.tar.bz2
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..315803a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+usermode-1.93.tar.bz2
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 044dc97..0000000
--- a/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# Makefile for source rpm: usermode
-# $Id$
-NAME := usermode
-SPECFILE = $(firstword $(wildcard *.spec))
-
-include ../common/Makefile.common
diff --git a/sources b/sources
index 410cd2d..d802adb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d036105f567bf0649bbec0c5866a0f81  usermode-1.91.1.tar.bz2
+82a157127cc827c0ad4d33fc52a92cb0  usermode-1.93.tar.bz2
diff --git a/usermode.spec b/usermode.spec
index 63a1485..931fdc4 100644
--- a/usermode.spec
+++ b/usermode.spec
@@ -4,16 +4,16 @@
 
 Summary: Tools for certain user account management tasks
 Name: usermode
-Version: 1.91.1
-Release: 1
-License: GPL
+Version: 1.93
+Release: 1%{?dist}
+License: GPLv2+
 Group: Applications/System
 Source: usermode-%{version}.tar.bz2
 Requires: util-linux, pam >= 0.75-37, /etc/pam.d/system-auth, passwd
 Conflicts: SysVinit < 2.74-14
 BuildRequires: desktop-file-utils, e2fsprogs-devel, glib2-devel, gtk2-devel
 BuildRequires: libglade2-devel, libuser-devel, pam-devel, util-linux
-BuildRequires: perl-XML-Parser, libattr-devel, libSM-devel, gettext
+BuildRequires: perl-XML-Parser, libSM-devel, gettext
 %if %{WITH_SELINUX}
 BuildRequires: libselinux-devel >= 1.17.13-2
 %endif
@@ -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,21 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/*
 
 %changelog
+* Wed Sep  5 2007 Miloslav Trmač <mitr@redhat.com> - 1.93-1
+- Fix handling of PAM conversations with no questions
+  Resolves: #267361
+- Update License:
+
+* 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
+- Remove BuildRequires: libattr-devel
+
 * Thu Apr 19 2007 Miloslav Trmac <mitr@redhat.com> - 1.91.1-1
 - New release with updated translations