diff --git a/python-flask.spec b/python-flask.spec
index 44b2ba2..d4184c6 100644
--- a/python-flask.spec
+++ b/python-flask.spec
@@ -1,25 +1,30 @@
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-
 %global srcname Flask
 %global srcversion 0.9
 
 Name:           python-flask
 Version:        0.9
-Release:        1%{?dist}
+Release:        4%{?dist}
+Epoch:          1
 Summary:        A micro-framework for Python based on Werkzeug, Jinja 2 and good intentions
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://flask.pocoo.org/
 Source0:        http://pypi.python.org/packages/source/F/Flask/%{srcname}-%{srcversion}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python2-devel
-BuildRequires:  python-setuptools-devel
-BuildRequires:  python-jinja2-26 python-werkzeug python-sphinx
+BuildRequires:  python2-devel python-setuptools-devel python-werkzeug python-sphinx
+Requires:       python-werkzeug python-sphinx
+
+%if 0%{?rhel}
+BuildRequires:  python-jinja2-26
+Requires:       python-jinja2-26
+%else
+BuildRequires:  python-jinja2
+Requires:       python-jinja2
+%endif
+
 
-Requires:       python-jinja2-26 python-werkzeug
 
 %description
 Flask is called a “micro-framework” because the idea to keep the core
@@ -50,44 +55,47 @@ Documentation and examples for %{name}.
 %{__python} setup.py build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
 # Need to install flask in the setuptools "develop" mode to build docs
 # The BuildRequires on Werkzeug, Jinja2 and Sphinx is due to this as well.
-export PYTHONPATH=$RPM_BUILD_ROOT%{python_sitelib}
-%{__python} setup.py develop --install-dir $RPM_BUILD_ROOT%{python_sitelib}
+export PYTHONPATH=%{buildroot}%{python_sitelib}
+%{__python} setup.py develop --install-dir %{buildroot}%{python_sitelib}
 make -C docs html
 
-rm -rf $RPM_BUILD_ROOT%{python_sitelib}/site.py
-rm -rf $RPM_BUILD_ROOT%{python_sitelib}/site.py[co]
-rm -rf $RPM_BUILD_ROOT%{python_sitelib}/easy-install.pth
+rm -rf %{buildroot}%{python_sitelib}/site.py
+rm -rf %{buildroot}%{python_sitelib}/site.py[co]
+rm -rf %{buildroot}%{python_sitelib}/easy-install.pth
 rm -rf docs/_build/html/.buildinfo
 rm -rf examples/minitwit/*.pyc
 rm -rf examples/flaskr/*.pyc
 rm -rf examples/jqueryexample/*.pyc
 
 %check
-echo 'import flask' | python
 %{__python} setup.py test
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS LICENSE PKG-INFO CHANGES README
 %{python_sitelib}/*.egg-info
 %{python_sitelib}/*.egg-link
 %{python_sitelib}/flask
 
 %files doc
-%defattr(-,root,root,-)
 %doc docs/_build/html examples
 
 %changelog
-* Wed Aug 8 2012 Ricky Elrod <codeblock@fedoraproject.org> - 0.9-1
+* Wed Aug 8 2012 Ricky Elrod <codeblock@fedoraproject.org> - 0.9-4
+- Fix changelog messup.
+
+* Wed Aug 8 2012 Ricky Elrod <codeblock@fedoraproject.org> - 0.9-3
+- Unified spec for EL6 and Fedora
+
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Mon Jul  2 2012 Haïkel Guémar <hguemar@fedoraproject.org> - 0.9.0-1
 - upstream 0.9
+- spec cleanups
 
 * Sun Jul  1 2012 Haïkel Guémar <hguemar@fedoraproject.org> - 0.8.1-1
 - upstream 0.8.1 (minor bugfixes)