diff --git a/python-markdown/.footprint b/python-markdown/.footprint
index f2064f223..723ddbc9a 100644
--- a/python-markdown/.footprint
+++ b/python-markdown/.footprint
@@ -1,11 +1,61 @@
 drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/bin/
+lrwxrwxrwx	root/root	usr/bin/markdown -> /usr/bin/markdown-cli.py
+-rwxr-xr-x	root/root	usr/bin/markdown-cli.py
 drwxr-xr-x	root/root	usr/lib/
-drwxr-xr-x	root/root	usr/lib/python2.6/
-drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/markdown-1.7-py2.6.egg-info
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/markdown.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/markdown.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mdx_footnotes.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mdx_footnotes.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mdx_rss.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mdx_rss.pyc
+drwxr-xr-x	root/root	usr/lib/python2.7/
+drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/
+drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/markdown/
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/__init__.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/__init__.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/blockparser.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/blockparser.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/blockprocessors.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/blockprocessors.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/commandline.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/commandline.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/etree_loader.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/etree_loader.pyc
+drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/markdown/extensions/
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/extensions/__init__.py (EMPTY)
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/extensions/__init__.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/extensions/abbr.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/extensions/abbr.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/extensions/codehilite.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/extensions/codehilite.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/extensions/def_list.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/extensions/def_list.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/extensions/extra.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/extensions/extra.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/extensions/fenced_code.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/extensions/fenced_code.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/extensions/footnotes.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/extensions/footnotes.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/extensions/headerid.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/extensions/headerid.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/extensions/html_tidy.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/extensions/html_tidy.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/extensions/imagelinks.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/extensions/imagelinks.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/extensions/meta.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/extensions/meta.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/extensions/rss.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/extensions/rss.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/extensions/tables.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/extensions/tables.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/extensions/toc.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/extensions/toc.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/extensions/wikilinks.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/extensions/wikilinks.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/html4.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/html4.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/inlinepatterns.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/inlinepatterns.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/odict.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/odict.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/postprocessors.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/postprocessors.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/preprocessors.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/preprocessors.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/treeprocessors.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/markdown/treeprocessors.pyc
diff --git a/python-markdown/.md5sum b/python-markdown/.md5sum
index 60d277305..b162087a1 100644
--- a/python-markdown/.md5sum
+++ b/python-markdown/.md5sum
@@ -1 +1 @@
-4297ebcdedc92b4bc7bc9ecd01053565  markdown-1.7.tar.gz
+4db8d332f531de10370ebaf1d2615786  Markdown-2.0.tar.gz
diff --git a/python-markdown/Pkgfile b/python-markdown/Pkgfile
index ab9ce035d..088e91e93 100644
--- a/python-markdown/Pkgfile
+++ b/python-markdown/Pkgfile
@@ -1,14 +1,20 @@
 # Description: Python implementation of markdown
 # URL: http://www.freewisdom.org/projects/python-markdown/
-# Maintainer: Lucas Hazel, lucas at die dot net dot au
-# Depends on: python
+# Maintainer: Mikhail Kolesnik, mike at openbunker dot org
+# Packager: Lucas Hazel, lucas at die dot net dot au
+# Depends on: setuptools
 
 name=python-markdown
-version=1.7
+version=2.0
 release=1
-source=(http://download.sourceforge.net/$name/markdown-$version.tar.gz)
+source=(http://pypi.python.org/packages/source/M/Markdown/Markdown-$version.tar.gz)
 
 build() {
-	cd markdown-$version
+	cd Markdown-$version
 	python setup.py install --root=$PKG
+	# having markdown.py in /usr/bin results in a cycled markdown loading
+	# in some cases
+	mv $PKG/usr/bin/markdown.py $PKG/usr/bin/markdown-cli.py
+	ln -s /usr/bin/markdown-cli.py  $PKG/usr/bin/markdown
+	find $PKG -name '*egg-info' | xargs rm -rf
 }