diff --git a/cherrytree.spec b/cherrytree.spec
index 78eae0e..896d190 100644
--- a/cherrytree.spec
+++ b/cherrytree.spec
@@ -20,7 +20,7 @@ Summary:        A hierarchical note taking application
 Url:            http://www.giuspen.com/cherrytree/
 Group:          Productivity/Office/Other
 Source:         %{name}-%{version}.tar.bz2
-# PATCH-FIX-openSUSE %{name}-remove-shebang-line.patch badshah400@gmail.com -- delete shebang lines in .py files
+# PATCH-FIX-OPENSUSE %{name}-remove-shebang-line.patch badshah400@gmail.com -- delete shebang lines in .py files
 Patch0:         %{name}-remove-shebang-line.patch
 BuildRequires:  desktop-file-utils
 BuildRequires:  python-gtk
@@ -29,23 +29,21 @@ BuildRequires:  update-desktop-files
 Requires:       %{name}-lang = %{version}
 Requires:       python-gtk
 Requires:       python-gtksourceview
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires(post): shared-mime-info
-Requires(post): xdg-utils
+Requires(postun): shared-mime-info
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} >= 1120
 BuildArch:      noarch
 %endif
 %py_requires
-
-%description
-A hierarchical note taking application,
-featuring rich text and syntax highlighting, storing
-all the data (including images) in a single xml file
-with extension ".ctd".
-
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 
+%description
+A hierarchical note taking application, featuring rich text and syntax
+highlighting, storing all the data (including images) in a single xml
+file with extension ".ctd".
+
 %lang_package
 %prep
 %setup -q
@@ -56,10 +54,11 @@ with extension ".ctd".
 %install
 %{__python} setup.py install --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} --root=%{buildroot}
 rm %{buildroot}%{_datadir}/cherrytree/glade/cherrytree.glade.h
+# Remove old mime registration files
 rm -f %{buildroot}%{_datadir}/application-registry/cherrytree.*
 rm -f %{buildroot}%{_datadir}/mime-info/cherrytree.*
 %find_lang %{name}
-%suse_update_desktop_file -r -G "Hierarchical Notes Utility" cherrytree GNOME GTK Utility TextEditor
+%suse_update_desktop_file -G "Hierarchical Notes Utility" cherrytree TextEditor
 
 %clean
 rm -rf %{buildroot}
@@ -68,16 +67,15 @@ rm -rf %{buildroot}
 %if 0%{?suse_version} >= 1140
 %icon_theme_cache_post
 %else
-gtk-update-icon-cache %{_datadir}/icons/hicolor
+gtk-update-icon-cache %{_datadir}/icons/hicolor || true
 %endif
-xdg-mime install --novendor /usr/share/mime/packages/cherrytree.xml
 update-mime-database %{_datadir}/mime
 
 %postun
 %if 0%{?suse_version} >= 1140
 %icon_theme_cache_postun
 %else
-gtk-update-icon-cache %{_datadir}/icons/hicolor
+gtk-update-icon-cache %{_datadir}/icons/hicolor || true
 %endif
 update-mime-database %{_datadir}/mime
 
@@ -85,10 +83,10 @@ update-mime-database %{_datadir}/mime
 %defattr(-,root,root)
 %doc changelog license
 %{_bindir}/cherrytree
-%{_datadir}/cherrytree/
 %{_datadir}/applications/cherrytree.desktop
-%{_datadir}/mime/packages/cherrytree.xml
+%{_datadir}/cherrytree/
 %{_datadir}/icons/hicolor/scalable/apps/cherrytree.svg
+%{_datadir}/mime/packages/cherrytree.xml
 %{python_sitelib}/CherryTree-0.14-py2.6.egg-info
 
 %files lang -f %{name}.lang