diff --git a/.gitignore b/.gitignore
index 6085023..f3238fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ x-tile-1.5.2.tar.gz
 /x-tile-2.3.1.tar.bz2
 /x-tile-2.4.tar.bz2
 /x-tile-2.5.tar.xz
+/x-tile-2.5.1.tar.xz
diff --git a/sources b/sources
index e705c35..7815427 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-580ad2acde9a528db95ce5bdab7ed3ef  x-tile-2.5.tar.xz
+SHA512 (x-tile-2.5.1.tar.xz) = 102d0bf90c38be0f55c8328d1fee9da48cb15087408943736eca9d79c3e9fe183fa5c0e97c88d179381b655c48339671f3f5f05145632a4e5be332ca640538c7
diff --git a/x-tile.spec b/x-tile.spec
index c88efc3..1091e2e 100644
--- a/x-tile.spec
+++ b/x-tile.spec
@@ -1,16 +1,16 @@
 Name:           x-tile
-Version:        2.5
-Release:        8%{?dist}
+Version:        2.5.1
+Release:        1%{?dist}
 Summary:        A GTK application to tile windows in different ways
 
-Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://www.giuspen.com/x-tile/
 Source0:        http://www.giuspen.com/software/%{name}-%{version}.tar.xz
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
-BuildRequires:  python-setuptools
+BuildRequires:  pygtk2
+BuildRequires:  python2-devel
 Requires:       gnome-python2-gconf
 Requires:       pygtk2
 BuildArch:      noarch
@@ -23,56 +23,40 @@ programming.
 
 
 %prep
-%setup -q
-
-# Remove import of cons module in setup.py, only needed to get the current
-# version of x-tile. The cons module calls the gtk one, which needs a running
-# graphical session
-sed -i "\|import cons|d; s|cons.VERSION|\"%{version}\"|" setup.py
+%autosetup
 
 
 %build
-%{__python} setup.py build
+mkdir -p build/scripts-%{python2_version}/
+%py2_build
 
 
 %install
-%{__python} setup.py install \
-  --no-compile \
-  --root $RPM_BUILD_ROOT
-
-rm $RPM_BUILD_ROOT%{_datadir}/%{name}/glade/x-tile.glade.h
-
-desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+%py2_install
+install -Dpm 0755 %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
 
 %find_lang %{name}
 
 
-%post
-/bin/touch --no-create %{_datadir}/icons/hicolor/ &>/dev/null || :
-
-
-%postun
-if [ $1 -eq 0 ] ; then
-  /bin/touch --no-create %{_datadir}/icons/hicolor/ &>/dev/null
-  /usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor/ &>/dev/null || :
-fi
-
-
-%posttrans
-/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor/ &>/dev/null || :
+%check
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 
 %files -f %{name}.lang
-%doc license
+%license license
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.svg
-%{python_sitelib}/*.egg-info
+%{python2_sitelib}/*.egg-info
 %{_mandir}/man1/%{name}.1.*
 
 
 %changelog
+* Fri Aug 03 2018 Mohamed El Morabity <melmorabity@fedoraproject.org> - 2.5.1-1
+- Update to 2.5.1
+- Spec cleanup
+
 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.5-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild