diff --git a/.gitignore b/.gitignore
index d362e38..7760af4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-Jinja2-2.5.tar.gz
+/Jinja2-2.5.tar.gz
+/Jinja2-2.5.2.tar.gz
diff --git a/python-jinja2.spec b/python-jinja2.spec
index 02c7436..265cc1a 100644
--- a/python-jinja2.spec
+++ b/python-jinja2.spec
@@ -1,7 +1,7 @@
 %if 0%{?fedora} > 12 || 0%{?rhel} > 6
 %global with_python3 1
 %else
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %endif
 
 # Enable building without docs to avoid a circular dependency between this
@@ -9,23 +9,28 @@
 %global with_docs 0
 
 Name:		python-jinja2
-Version:	2.5
-Release:	4%{?dist}
+Version:	2.5.2
+Release:	1%{?dist}
 Summary:	General purpose template engine
 Group:		Development/Languages
 License:	BSD
 URL:		http://jinja.pocoo.org/
 Source0:	http://pypi.python.org/packages/source/J/Jinja2/Jinja2-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:	noarch
 BuildRequires:	python-devel
 BuildRequires:	python-setuptools
+BuildRequires:	python-markupsafe
 %if 0%{?with_docs}
 BuildRequires:	python-sphinx
 %endif # with_docs
 Requires:	python-babel >= 0.8
+Requires:	python-markupsafe
 %if 0%{?with_python3}
 BuildRequires:	python3-devel
 BuildRequires:	python3-setuptools
+BuildRequires:	python3-markupsafe
+Requires:	python3-markupsafe
 # babel isn't py3k ready yet, and is only a weak dependency
 #Requires:	 python3-babel >= 0.8
 %endif # with_python3
@@ -69,6 +74,9 @@ environments.
 %prep
 %setup -q -n Jinja2-%{version}
 
+# cleanup
+find . -name '*.pyo' -o -name '*.pyc' -delete
+
 # fix EOL
 sed -i 's|\r$||g' LICENSE
 
@@ -78,7 +86,7 @@ cp -a . %{py3dir}
 
 
 %build
-CFLAGS="%{optflags}" %{__python} setup.py --with-speedups build
+%{__python} setup.py build
 
 # for now, we build docs using Python 2.x and use that for both
 # packages.
@@ -88,29 +96,24 @@ make -C docs html
 
 %if 0%{?with_python3}
 pushd %{py3dir}
-CFLAGS="%{optflags}" %{__python3} setup.py --with-speedups build
+%{__python3} setup.py build
 popd
 %endif # with_python3
 
 
 %install
 rm -rf %{buildroot}
-%{__python} setup.py --with-speedups install -O1 --skip-build \
+%{__python} setup.py install -O1 --skip-build \
 	    --root %{buildroot}
 
-# ensure correct permission
-chmod 0755 %{buildroot}%{python_sitearch}/jinja2/_speedups.so
-
 # remove hidden file
 rm -rf docs/_build/html/.buildinfo
 
 %if 0%{?with_python3}
 pushd %{py3dir}
-%{__python3} setup.py --with-speedups install -O1 --skip-build \
+%{__python3} setup.py install -O1 --skip-build \
 	    --root %{buildroot}
-
-# ensure correct permission
-chmod 0755 %{buildroot}%{python3_sitearch}/jinja2/_speedups.so
+popd
 %endif # with_python3
 
 
@@ -137,8 +140,8 @@ popd
 %endif # with_docs
 %doc ext
 %doc examples
-%{python_sitearch}/*
-%exclude %{python_sitearch}/jinja2/_speedups.c
+%{python_sitelib}/*
+%exclude %{python_sitelib}/jinja2/_debugsupport.c
 
 
 %if 0%{?with_python3}
@@ -150,12 +153,16 @@ popd
 %endif # with_docs
 %doc ext
 %doc examples
-%{python3_sitearch}/*
-%exclude %{python3_sitearch}/jinja2/_speedups.c
+%{python3_sitelib}/*
+%exclude %{python3_sitelib}/jinja2/_debugsupport.c
 %endif # with_python3
 
 
 %changelog
+* Thu Aug 19 2010 Thomas Moschny <thomas.moschny@gmx.de> - 2.5.2-1
+- Update to upstream version 2.5.2.
+- Package depends on python-markupsafe and is noarch now.
+
 * Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 2.5-4
 - add explicit build-requirement on python-setuptools
 - fix doc disablement for python3 subpackage
diff --git a/sources b/sources
index 34d4778..a679abf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d02f82e33afe918cef8a9abcd23ccd78  Jinja2-2.5.tar.gz
+3829be2926a067ee024e6d3e5327dbf7  Jinja2-2.5.2.tar.gz