Index: django/contrib/markup/templatetags/markup.py
===================================================================
--- django/contrib/markup/templatetags/markup.py	(revision 6913)
+++ django/contrib/markup/templatetags/markup.py	(working copy)
@@ -50,11 +50,14 @@
 
     """
     try:
-        import markdown
+        import markdown2 as markdown
     except ImportError:
-        if settings.DEBUG:
-            raise template.TemplateSyntaxError, "Error in {% markdown %} filter: The Python markdown library isn't installed."
-        return force_unicode(value)
+        try:
+            import markdown
+        except ImportError:
+            if settings.DEBUG:
+                raise template.TemplateSyntaxError, "Error in {% markdown %} filter: Neither the Python markdown or markdown2 library is installed."
+            return force_unicode(value)
     else:
         # markdown.version was first added in 1.6b. The only version of markdown
         # to fully support extensions before 1.6b was the shortlived 1.6a.