diff --git a/.gitignore b/.gitignore
index 139cfee..059de8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 altgraph-0.6.7.tar.gz
+/altgraph-0.9.tar.gz
diff --git a/python-altgraph.spec b/python-altgraph.spec
index 344be5c..84145b0 100644
--- a/python-altgraph.spec
+++ b/python-altgraph.spec
@@ -1,18 +1,22 @@
+%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%endif
 
-Name:           python-altgraph
-Version:        0.6.7
-Release:        6%{?dist}
+%global srcname altgraph
+
+Name:           python-%{srcname}
+Version:        0.9
+Release:        1%{?dist}
 Summary:        Python graph (network) package
 
 Group:          Applications/Engineering
 License:        MIT
-URL:            http://undefined.org/python/#altgraph
-Source0:        http://pypi.python.org/packages/source/a/altgraph/altgraph-%{version}.tar.gz
+URL:            http://pypi.python.org/pypi/altgraph/
+Source0:        http://pypi.python.org/packages/source/a/%{srcname}/%{srcname}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  python
+BuildRequires:  python2-devel
 BuildRequires:  python-setuptools-devel
 
 Requires:       pydot
@@ -25,7 +29,7 @@ graphviz output.
 
 
 %prep
-%setup -q -n altgraph-%{version}
+%setup -q -n %{srcname}-%{version}
 #Dot.py is provided by graphviz through pydot
 rm altgraph/Dot.py
 
@@ -46,11 +50,15 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc PKG-INFO test/test_altgraph.py
-%{python_sitelib}/altgraph/
-%{python_sitelib}/altgraph*.egg-info
+%{python_sitelib}/%{srcname}/
+%{python_sitelib}/%{srcname}*.egg-info
 
 
 %changelog
+* Sun Apr 03 2011 Fabian Affolter <fabian@bernewireless.net> - 0.9-1
+- Updated URL and macros
+- Updated to new upstream version 0.9
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.7-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 44d3a4e..a982575 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6792e11b471e70ab3d4dfecf41fb759e  altgraph-0.6.7.tar.gz
+367015bf871815b632975a26d1750133  altgraph-0.9.tar.gz