diff --git a/.gitignore b/.gitignore
index 4651f81..b295819 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 Markdown-2.0.3.tar.gz
 /Markdown-2.1.0.tar.gz
 /Markdown-2.1.1.tar.gz
+/Markdown-2.2.0.tar.gz
diff --git a/python-markdown.spec b/python-markdown.spec
index e631c9b..0eda582 100644
--- a/python-markdown.spec
+++ b/python-markdown.spec
@@ -8,13 +8,15 @@
 %define srcname Markdown
 
 Name:           python-markdown
-Version:        2.1.1
+Version:        2.2.0
 Release:        1%{?dist}
 Summary:        Markdown implementation in Python
 Group:          Development/Languages
 License:        BSD
-URL:            http://www.freewisdom.org/projects/python-markdown/
+URL:            http://packages.python.org/Markdown/
 Source0:        http://pypi.python.org/packages/source/M/%{srcname}/%{srcname}-%{version}.tar.gz
+# commit 5b3e724f
+Patch0:         Markdown-2.2.0-extension-api.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -52,11 +54,15 @@ there are a few known issues.
 
 %prep
 %setup -q -n %{srcname}-%{version}
+%patch0 -p1
 
 # remove shebangs
 find markdown -type f -name '*.py' \
   -exec sed -i -e '/^#!/{1D}' {} \;
 
+# fix line-ending
+sed -i 's/\r//' docs/release-2.2.0.txt
+
 %if 0%{?with_python3}
 cp -a . %{py3dir}
 %endif # with_python3
@@ -125,6 +131,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Jul 14 2012 Thomas Moschny <thomas.moschny@gmx.de> - 2.2.0-1
+- Update to 2.2.0.
+- Update url.
+- Add patch from upstream git for failing test.
+
 * Wed Feb  8 2012 Thomas Moschny <thomas.moschny@gmx.de> - 2.1.1-1
 - Update to 2.1.1.
 
diff --git a/sources b/sources
index 03c1294..934be9f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3f82d30c488e4b88b8f86eb1c9ad0da7  Markdown-2.1.1.tar.gz
+28dd4f54894b3af2615b08f50d2ce4bf  Markdown-2.2.0.tar.gz