diff --git a/.gitignore b/.gitignore
index a0fead1..d2ebc1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ Markdown-2.0.3.tar.gz
 /Markdown-2.1.1.tar.gz
 /Markdown-2.2.0.tar.gz
 /Markdown-2.2.1.tar.gz
+/Markdown-2.3.tar.gz
diff --git a/python-markdown.spec b/python-markdown.spec
index 38217bb..2cf78cd 100644
--- a/python-markdown.spec
+++ b/python-markdown.spec
@@ -8,26 +8,21 @@
 %define srcname Markdown
 
 Name:           python-markdown
-Version:        2.2.1
-Release:        2%{?dist}
+Version:        2.3
+Release:        1%{?dist}
 Summary:        Markdown implementation in Python
 Group:          Development/Languages
 License:        BSD
-URL:            http://packages.python.org/Markdown/
+URL:            http://packages.python.org/%{srcname}/
 Source0:        http://pypi.python.org/packages/source/M/%{srcname}/%{srcname}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  python-devel
+BuildRequires:  python-devel >= 2.6
 BuildRequires:  python-nose
-%if 0%{?rhel} && 0%{?rhel} < 7
-BuildRequires:  python-elementtree
-Requires:       python-elementtree
-%endif
+Requires:       python >= 2.6
 %if 0%{?with_python3}
-BuildRequires:  python3-devel
+BuildRequires:  python3-devel >= 3.1
 BuildRequires:  python3-nose
-# for converting before running the tests:
-BuildRequires:  /usr/bin/2to3
+Requires:       python3 >= 3.1
 %endif # with_python3
 
 
@@ -76,7 +71,6 @@ popd
 
 
 %install
-rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
 # rename binary
@@ -96,22 +90,16 @@ ln -s markdown_py-%{python_version} %{buildroot}%{_bindir}/markdown_py
 
 
 %check
-./run-tests.py
+%{__python} run-tests.py
 
 %if 0%{?with_python3}
 pushd %{py3dir}
-2to3 -d -w -n markdown tests run-tests.py > /dev/null
-./run-tests.py
+%{__python3} run-tests.py
 popd
 %endif # with_python3
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %files
-%defattr(-,root,root,-)
 %doc build/docs/*
 %{python_sitelib}/*
 %{_bindir}/markdown_py
@@ -120,7 +108,6 @@ rm -rf %{buildroot}
 
 %if 0%{?with_python3}
 %files -n python3-markdown
-%defattr(-,root,root,-)
 %doc build/docs/*
 %{python3_sitelib}/*
 %{_bindir}/markdown_py-%{python3_version}
@@ -128,6 +115,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Mar 18 2013 Thomas Moschny <thomas.moschny@gmx.de> - 2.3-1
+- Update to 2.3.
+- Spec file cleanups.
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index f6205bd..7719a72 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9e002c8051fb346cae75060f3302048a  Markdown-2.2.1.tar.gz
+f33677b74fd8e5c8553dbc065787ded3  Markdown-2.3.tar.gz