diff --git a/symposion/proposals/models.py b/symposion/proposals/models.py
index 0a45b9d8accc52fec0244a4bd93cfa4750f53d23..4fe07c2ddcbc5d7346379aec5220a105f48c7225 100644
--- a/symposion/proposals/models.py
+++ b/symposion/proposals/models.py
@@ -90,7 +90,8 @@ class ProposalBase(models.Model):
         _("Abstract"),
         help_text=_("This will appear in the conference programme. Up to about "
                     "500 words. Edit using <a "
-                    "href='http://daringfireball.net/projects/markdown/basics' " "target='_blank'>Markdown</a>.")
+                    "href='http://warpedvisions.org/projects/"
+                    "markdown-cheat-sheet/' target='_blank'>Markdown</a>.")
     )
     abstract_html = models.TextField(blank=True)
 
@@ -98,8 +99,9 @@ class ProposalBase(models.Model):
         _("Private Abstract"),
         help_text=_("This will only be shown to organisers and reviewers. You "
                     "should provide any details about your proposal that you "
-                    "don't want to be public here. Edit using <a " "href='http://daringfireball.net/projects/markdown/basics' "
-                    "target='_blank'>Markdown</a>.")
+                    "don't want to be public here. Edit using <a "
+                    "href='http://warpedvisions.org/projects/"
+                    "markdown-cheat-sheet/' target='_blank'>Markdown</a>.")
     )
     private_abstract_html = models.TextField(blank=True)
 
@@ -112,8 +114,8 @@ class ProposalBase(models.Model):
                     "static IP address, A/V equipment or will be demonstrating "
                     "security-related techniques on the conference network. "
                     "Edit using <a "
-                    "href='http://daringfireball.net/projects/markdown/basics' "
-                    "target='_blank'>Markdown</a>.")
+                    "href='http://warpedvisions.org/projects/"
+                    "markdown-cheat-sheet/' target='_blank'>Markdown</a>.")
     )
     technical_requirements_html = models.TextField(blank=True)
 
diff --git a/symposion/speakers/models.py b/symposion/speakers/models.py
index 8e8329016e4de7a9929e80639c072ca4564b7622..d1ba409ec79ec444daa70ace873742e117348023 100644
--- a/symposion/speakers/models.py
+++ b/symposion/speakers/models.py
@@ -30,7 +30,7 @@ class Speaker(models.Model):
                     "programme.  Please write in the third person, eg 'Alice "
                     "is a Moblin hacker...', 150-200 words. Edit using "
                     "<a href='http://warpedvisions.org/projects/"
-                    "markdown-cheat-sheet/target='_blank'>"
+                    "markdown-cheat-sheet/' target='_blank'>"
                     "Markdown</a>."),
         verbose_name=_("Biography"),
     )
@@ -42,7 +42,7 @@ class Speaker(models.Model):
                     "seen by the organisers and reviewers; use it to convince "
                     "them why they should accept your proposal. Edit using "
                     "<a href='http://warpedvisions.org/projects/"
-                    "markdown-cheat-sheet/target='_blank'>"
+                    "markdown-cheat-sheet/' target='_blank'>"
                     "Markdown</a>."),
         verbose_name=_("Speaking experience"),
     )
@@ -68,7 +68,7 @@ class Speaker(models.Model):
         help_text=_("Please describe any special accessibility requirements "
         "that you may have. Edit using "
         "<a href='http://warpedvisions.org/projects/"
-        "markdown-cheat-sheet/target='_blank'>Markdown</a>."),
+        "markdown-cheat-sheet/' target='_blank'>Markdown</a>."),
         verbose_name=_("Accessibility requirements"))
     accessibility_html = models.TextField(blank=True)
     travel_assistance = models.BooleanField(