diff --git a/gmrun.spec b/gmrun.spec
index faca649..113261d 100644
--- a/gmrun.spec
+++ b/gmrun.spec
@@ -1,8 +1,14 @@
 Name:			gmrun
 Version:		0.9.2
-Release:		23%{?dist}
+Release:		22%{?dist}
 Summary:		Lightweight "Run program" dialog box with search history and tab completion
 
+%if 0%{?rhel} <= 5
+%define new_version	0
+%else
+%define new_version	1
+%endif
+
 Group:			User Interface/Desktops
 License:		GPL+
 URL:			http://sourceforge.net/projects/gmrun
@@ -10,11 +16,11 @@ Source0:		http://heanet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version
 Patch0:			gmrun-gmrunrc.patch
 Patch1:			gmrun-0.9.2-gcc43.patch
 Patch2:			gmrun-0.9.2-mousewheel.patch
-%if 0%{?fedora} >= 11
+%if %{new_version} == 1
 Patch3:			gmrun-0.9.2-f12.patch
 %endif
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if 0%{?fedora} >= 8
+%if %{new_version} == 1
 BuildRequires:	popt-devel
 %else
 BuildRequires:	popt
@@ -69,12 +75,16 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jul 25 2011 Gilboa Davara <gilboad@gmail.com> - 0.9.2-24
+- EL6 support.
+- Cleaner spec.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.2-23
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
 * Wed Apr 28 2010 Gilboa Davara <gilboad@gmail.com> - 0.9.2-22
 - Replace man with man-pages-reader. (#582930)
-	
+
 * Fri Jan 22 2010 Gilboa Davara <gilboad@gmail.com> - 0.9.2-21
 - Make the F12 optional on F11 and above.