diff --git a/app/views/content_viewer/_comment.rhtml b/app/views/content_viewer/_comment.rhtml
index de0d8f0..18b9f64 100644
--- a/app/views/content_viewer/_comment.rhtml
+++ b/app/views/content_viewer/_comment.rhtml
@@ -27,6 +27,16 @@
     <%= '<br/>' + _('(unauthenticated user)') if ! comment.author %>
   </div>
   <div class="comment-text">
-    <%= comment.body %>
+    <p/>
+    <%=
+      comment.body.
+              gsub( /\n\s*\n/, ' <p/> ' ).
+              gsub( /\n/, ' <br/> ' ).
+              gsub( /(^|\s)(www\.[^\s])/, '\1http://\2' ).
+              gsub( /(https?:\/\/([^\s]+))/,
+                    '<a href="\1" target="_blank" rel="nofolow" onclick="return confirm(\'' +
+                    escape_javascript( _('Are you sure you want to visit this web site?') ) +
+                    '\n\n\'+this.href)">\2</a>' )
+    %>
   </div>
 </div>
--
libgit2 0.21.2