diff --git a/.cvsignore b/.cvsignore
index e8c096a..7ac7817 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-markdown-1.7.tar.gz
+Markdown-2.0.tar.gz
diff --git a/import.log b/import.log
index dd353ec..ad5c755 100644
--- a/import.log
+++ b/import.log
@@ -1 +1,2 @@
 python-markdown-1_7-1_fc9:HEAD:python-markdown-1.7-1.fc9.src.rpm:1218525227
+python-markdown-2_0-1_fc10:HEAD:python-markdown-2.0-1.fc10.src.rpm:1240905362
diff --git a/markdown b/markdown
deleted file mode 100644
index 930561d..0000000
--- a/markdown
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/python
-""" Run Markdown from the command line. """
-
-import sys
-from markdown import parse_options, markdownFromFile
-
-options = parse_options()
-
-#if os.access(inFile, os.R_OK):
-
-if not options:
-    sys.exit(0)
-    
-markdownFromFile(**options)
diff --git a/python-markdown.spec b/python-markdown.spec
index 8a0d2d3..4f5d40e 100644
--- a/python-markdown.spec
+++ b/python-markdown.spec
@@ -1,16 +1,15 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%define srcname markdown
+%define srcname Markdown
 
 Name:           python-markdown
-Version:        1.7
-Release:        3%{?dist}
+Version:        2.0
+Release:        1%{?dist}
 Summary:        Markdown implementation in Python
 Group:          Development/Languages
-License:        GPLv2 or BSD
+License:        BSD
 URL:            http://www.freewisdom.org/projects/python-markdown/
-Source0:        http://downloads.sourceforge.net/%{name}/%{srcname}-%{version}.tar.gz
-Source1:        markdown
+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
@@ -25,8 +24,9 @@ there are a few known issues.
 %prep
 %setup -q -n %{srcname}-%{version}
 
-# remove shebang
-%{__sed} -i -e '/#! *\/usr\/bin\/.*python.*/{1D}' markdown.py
+# remove shebangs
+find markdown -type f -name '*.py' \
+  -exec sed -i -e '/^#!/{1D}' {} \;
 
 
 %build
@@ -36,7 +36,7 @@ there are a few known issues.
 %install
 rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
-%{__install} -p -m 0755 -D %{SOURCE1} %{buildroot}%{_bindir}/markdown
+mv %{buildroot}%{_bindir}/markdown{.py,}
 
 
 %clean
@@ -45,17 +45,18 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGE_LOG.txt README.txt README.html
+%doc docs/*
 %{python_sitelib}/*
 %{_bindir}/markdown
 
 
 %changelog
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Sat Apr 25 2009 Thomas Moschny <thomas.moschny@gmx.de> - 2.0-1
+- Update to 2.0.
+- Adjusted source URL.
+- License is now BSD only.
+- Upstream now provides a script to run markdown from the cmdline.
 
-* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 1.7-2
-- Rebuild for Python 2.6
 
 * Mon Aug  4 2008 Thomas Moschny <thomas.moschny@gmx.de> - 1.7-1
 - New package.
diff --git a/sources b/sources
index 60d2773..b162087 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4297ebcdedc92b4bc7bc9ecd01053565  markdown-1.7.tar.gz
+4db8d332f531de10370ebaf1d2615786  Markdown-2.0.tar.gz