diff --git a/gmrun.spec b/gmrun.spec
index d40b82c..ceb9c51 100644
--- a/gmrun.spec
+++ b/gmrun.spec
@@ -1,17 +1,25 @@
 Name:			gmrun
 Version:		0.9.2
-Release:		7%{?dist}
+Release:		8%{?dist}
 Summary:		Lightweight "Run program" dialog box with search history and tab completion
 
 Group:			User Interface/Desktops
-License:		GPL
+License:		GPL+
 URL:			http://sourceforge.net/projects/gmrun
 Source0:		http://heanet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 Patch0:			gmrun-gmrunrc.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	gtk2-devel
+%define _rhel	%{expand:%%(/usr/lib/rpm/redhat/dist.sh --el)}
+%define _fedora	%{expand:%%(/usr/lib/rpm/redhat/dist.sh --fc)}
+
+%if 0%{_fedora} >= 8
+BuildRequires:	popt-devel
+%else
 BuildRequires:	popt
+%endif
+
+BuildRequires:	gtk2-devel
 Requires:		htmlview
 Requires:		xterm
 Requires:		man
@@ -53,23 +61,27 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sat Feb 10 2007 <gilboad AT gmail DOT com> - 0.9.2-7
+* Sun Aug 26 2007 Gilboa Davara <gilboad[AT]gmail.com> - 0.9.2-8
+- Fixed license tag.
+- Fixed F8 BR - popt-devel.
+
+* Sat Feb 10 2007 Gilboa Davara <gilboad[AT]gmail.com> - 0.9.2-7
 - Preserve the source time-stamp.
 
-* Sun Feb 04 2007 <gilboad AT gmail DOT com> - 0.9.2-6
+* Sun Feb 04 2007 Gilboa Davara <gilboad[AT]gmail.com> - 0.9.2-6
 - Fixed summery.
 - Remove redundant fileattr.
 
-* Sun Jan 28 2007 <gilboad AT gmail DOT com> - 0.9.2-5
+* Sun Jan 28 2007 Gilboa Davara <gilboad[AT]gmail.com> - 0.9.2-5
 - Missing REQ: man.
 - Missing REQ: info.
 - Missing REQ: xdg-open.
 - Use xdg-open to handle files.
 
-* Sat Jan 20 2007 <gilboad AT gmail DOT com> - 0.9.2-4
+* Sat Jan 20 2007 Gilboa Davara <gilboad[AT]gmail.com> - 0.9.2-4
 - Add missing NEWS to %%doc.
 
-* Thu Jan 18 2007 <gilboad AT gmail DOT com> - 0.9.2-3
+* Thu Jan 18 2007 Gilboa Davara <gilboad[AT]gmail.com> - 0.9.2-3
 - Fix wrong group and project URLs.
 - Fix summery, description.
 - Remove BR: glib2-devel. (REQ by gtk2-devel).
@@ -80,10 +92,10 @@ rm -rf $RPM_BUILD_ROOT
 - Add REQ: htmlview. (gmrunrc)
 - Add REQ: xterm. (gmrunrc)
 
-* Sat Jan 13 2007 <gilboad AT gmail DOT com> - 0.9.2-2
+* Sat Jan 13 2007 Gilboa Davara <gilboad[AT]gmail.com> - 0.9.2-2
 - Fix Source0 URL.
 - Remove redundant %%doc files.
 
-* Sat Jan 13 2007 <gilboad AT gmail DOT com> - 0.9.2-1
+* Sat Jan 13 2007 Gilboa Davara <gilboad[AT]gmail.com> - 0.9.2-1
 - Initial release.