diff --git a/lib/calcms/markup.pm b/lib/calcms/markup.pm
index 556e9b9..5724041 100644
--- a/lib/calcms/markup.pm
+++ b/lib/calcms/markup.pm
@@ -149,6 +149,7 @@ sub markdown_to_html($){
     my $text = $_[0] // '';
     print STDERR "markwon!\n";
     my $html = Text::Markdown::markdown($text);
+    $html=~s!(\s)(https?://[^\s]+)(\s)!$1<a href="$2">$2</a>$3!g;
     return $html;
 }