diff --git a/ChangeLog b/ChangeLog
index d8b64b6..1356faf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,4 +10,4 @@ v0.2 (09/02/2013)
 
 ** Bugs **
 	Escape double quotes in metas tag
-
+	Replace line returns by <br /> for comments
diff --git a/views.py b/views.py
index 02ef02e..c10516e 100644
--- a/views.py
+++ b/views.py
@@ -688,6 +688,7 @@ def add_comment(request, post_id, parent_id):
     the_comment = request.POST['the_comment']
     the_comment = the_comment.replace('<', '&lt;')
     the_comment = the_comment.replace('>', '&gt;')
+    the_comment = the_comment.replace('\n', '<br />')
 
     if 'mel' in request.POST:
         mel = request.POST['mel'].strip()