diff --git a/.gitignore b/.gitignore
index 520c1fd..89555f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-PyYAML-3.06.tar.gz
+PyYAML-3.09.tar.gz
diff --git a/PyYAML.spec b/PyYAML.spec
index f93697b..c9dacea 100644
--- a/PyYAML.spec
+++ b/PyYAML.spec
@@ -1,15 +1,17 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
+#====================================================================#
 
 Name:           PyYAML
-Version:        3.08
-Release:        4%{?dist}
+Version:        3.09
+Release:        6%{?dist}
 Summary:        YAML parser and emitter for Python
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://pyyaml.org/
 Source0:        http://pyyaml.org/download/pyyaml/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  python-devel, python-setuptools, libyaml-devel
 
@@ -20,38 +22,55 @@ emitter for Python.
 
 PyYAML features a complete YAML 1.1 parser, Unicode support, pickle
 support, capable extension API, and sensible error messages.  PyYAML
-supports standard YAML tags and provides Python-specific tags that allow
-to represent an arbitrary Python object.
+supports standard YAML tags and provides Python-specific tags that
+allow to represent an arbitrary Python object.
 
 PyYAML is applicable for a broad range of tasks from complex
 configuration files to object serialization and persistance.
 
 %prep
 %setup -q -n %{name}-%{version}
+chmod a-x examples/yaml-highlight/yaml_hl.py
 
 
 %build
-%{__python} setup.py build
-chmod a-x examples/yaml-highlight/yaml_hl.py
+CFLAGS="${RPM_OPT_FLAGS}" %{__python} setup.py --with-libyaml build
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/%{_bindir}
-%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
 %defattr(-,root,root,-)
-%doc PKG-INFO README LICENSE examples
-%{python_sitelib}/*
+%doc CHANGES LICENSE PKG-INFO README examples
+%{python_sitearch}/*
 
 
 %changelog
+* Tue Jul 27 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 3.09-6
+- Bump release number for upgrade path
+
+* Wed Jul 21 2010 David Malcolm <dmalcolm@redhat.com> - 3.09-3
+- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+
+* Fri Oct 02 2009 John Eckersberg <jeckersb@redhat.com> - 3.09-1
+- New upstream release 3.09
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.08-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 22 2009 - John Eckersberg <jeckersb@redhat.com> - 3.08-5
+- Minor tweaks to spec file aligning with latest Fedora packaging guidelines
+- Enforce inclusion of libyaml in build with --with-libyaml option to setup.py
+- Deliver to %%{python_sitearch} instead of %%{python_sitelib} due to _yaml.so
+- Thanks to Gareth Armstrong <gareth.armstrong@hp.com>
+
 * Tue Mar 3 2009 John Eckersberg <jeckersb@redhat.com> - 3.08-4
 - Correction, change libyaml to libyaml-devel in BuildRequires
 
diff --git a/sources b/sources
index 084d250..c484ace 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a4163a2017fa57f448c66815511fa555  PyYAML-3.08.tar.gz
+f219af2361e87fdc5e85e95b84c11d87  PyYAML-3.09.tar.gz