diff --git a/.gitignore b/.gitignore
index bc75888..cded60f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ hatari-1.3.1.tar.bz2
 /hatari-1.6.2.tar.bz2
 /hatari-1.7.0.tar.bz2
 /hatari-1.8.0.tar.bz2
+/hatari-1.9.0.tar.bz2
diff --git a/hatari.desktop b/hatari.desktop
deleted file mode 100644
index fae80ab..0000000
--- a/hatari.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Hatari
-Comment=Atari ST/STE/TT/Falcon emulator
-Exec=hatari
-Icon=hatari
-Terminal=false
-Type=Application
-Categories=Game;Emulator;
-
diff --git a/hatari.spec b/hatari.spec
index 1ce1918..1aa374f 100644
--- a/hatari.spec
+++ b/hatari.spec
@@ -1,13 +1,10 @@
-%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
-
 Summary: An Atari ST/STE/TT/Falcon emulator suitable for playing games
 Name: hatari
-Version: 1.8.0
-Release: 3%{?dist}
+Version: 1.9.0
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://hatari.tuxfamily.org/
 Source0: http://download.tuxfamily.org/%{name}/%{version}/%{name}-%{version}.tar.bz2
-Source1: hatari.desktop
 BuildRequires: cmake
 BuildRequires: SDL-devel >= 1.2.0
 BuildRequires: zlib-devel
@@ -15,7 +12,6 @@ BuildRequires: libpng-devel
 BuildRequires: readline-devel
 BuildRequires: portaudio-devel
 BuildRequires: python2-devel
-BuildRequires: libicns-utils
 BuildRequires: desktop-file-utils
 Requires: hicolor-icon-theme
 # Required by zip2st and atari-hd-image
@@ -64,10 +60,9 @@ do
   sed -i -e '/^#!\//, 1d' python-ui/$pyfile
 done
 
-# Fix hataiui to get doc files
-sed -i 's/"hatari" + sep/"%{name}%{!?_docdir_fmt:-%{version}}" + sep/' \
-  python-ui/uihelpers.py
-
+# Fix desktop file
+sed -i '/^MimeType=*/s/$/;/' \
+  share/applications/%{name}.desktop
 
 %build
 %cmake \
@@ -80,7 +75,7 @@ make
 
 
 %install
-make install DESTDIR=%{buildroot} 
+%make_install
 
 # Fix file permissions
 chmod 644 %{buildroot}%{_datadir}/%{name}/hatariui/conftypes.py
@@ -89,21 +84,9 @@ chmod 644 %{buildroot}%{_datadir}/%{name}/hatariui/conftypes.py
 install -d -m 755 %{buildroot}%{_mandir}/fr/man1
 install -p -m 644 doc/fr/hatari.1 %{buildroot}%{_mandir}/fr/man1
 
-# Install desktop file
-install -d -m 755 %{buildroot}%{_datadir}/applications
-desktop-file-install \
-  --dir %{buildroot}%{_datadir}/applications \
-  %{SOURCE1}
-
-# Extract Mac OS X icons
-icns2png -x src/gui-osx/Hatari.icns 
-
-# Install icons
-for i in 16 32 48 128; do
-  install -d -m 755 %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps
-  install -m 644 Hatari_${i}x${i}x32.png \
-    %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/hatari.png
-done
+# Validate desktop file
+desktop-file-validate \
+  %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 # Install hatari-ui desktop file
 desktop-file-install \
@@ -152,34 +135,40 @@ SentUpstream: 2014-09-24
 </application>
 EOF
 
+
 %post
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+/bin/touch --no-create %{_datadir}/mime/packages &>/dev/null || :
+/usr/bin/update-desktop-database &> /dev/null || :
 
 
 %post ui
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %postun
 if [ $1 -eq 0 ] ; then
-    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+    /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
 fi
+/usr/bin/update-desktop-database &> /dev/null || :
 
 
 %postun ui
 if [ $1 -eq 0 ] ; then
-    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
 
 %posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 
 %posttrans ui
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %files
@@ -188,7 +177,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_mandir}/man1/*
 %{_mandir}/fr/man1/*
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/hicolor/*/apps/%{name}.png
+%{_datadir}/appdata/*.appdata.xml
+%{_datadir}/icons/hicolor/*/apps/%{name}.*
+%{_datadir}/icons/hicolor/*/mimetypes/application-x-st-disk-image.*
+%{_datadir}/mime/packages/hatari.xml
 %doc %{_pkgdocdir}
 %exclude %{_bindir}/hatariui
 %exclude %{_datadir}/%{name}/hatariui
@@ -202,9 +194,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/%{name}/hconsole
 %{_mandir}/man1/hatariui.1*
 %{_mandir}/man1/hconsole.1*
-%{_datadir}/appdata/*.appdata.xml
 %{_datadir}/applications/hatariui.desktop
-%{_datadir}/icons/hicolor/32x32/apps/hatari-icon.png
 %doc python-ui/{README,release-notes.txt,TODO}
 %exclude %{_datadir}/%{name}/hatariui/README
 %exclude %{_datadir}/%{name}/hatariui/release-notes.txt
@@ -213,6 +203,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sat Oct 17 2015 Andrea Musuruane <musuruan@gmail.com> 1.9.0-1
+- Updated to upstream 1.9.0
+- Spec file cleanup
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index d229a77..1916838 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f78cf673debbbe2d523415ab605550e1  hatari-1.8.0.tar.bz2
+24e54b19958943dbe5ac1b1f6f32b284  hatari-1.9.0.tar.bz2