diff --git a/app/views/events/index.html.haml b/app/views/events/index.html.haml
index 6c554658..78807168 100644
--- a/app/views/events/index.html.haml
+++ b/app/views/events/index.html.haml
@@ -22,7 +22,7 @@
         -   .sort_by { |e| e.city }.each do |event|
           %li.event
             = link_to event do
-              %strong.city= event.city.gsub '-', ' '
+              %strong.city= event.city
               = event.title
 
 - else
@@ -41,7 +41,7 @@
       -   .sort_by { |e| e.city }.each do |event|
         %li.event
           = link_to event do
-            %strong.city= event.city.gsub '-', ' '
+            %strong.city= event.city
             = event.title
 
 .formats
diff --git a/app/views/events/index.ics.erb b/app/views/events/index.ics.erb
index cf7237fc..cd35c865 100644
--- a/app/views/events/index.ics.erb
+++ b/app/views/events/index.ics.erb
@@ -12,8 +12,8 @@ DTEND;TZID=Europe/Paris:<%= event.end_time.strftime '%Y%m%dT%H%M%S' %>
 UID:<%= event.id %>@agendadulibre.org
 SUMMARY:<%= event.title %>
 URL:<%= event_url event %>
-DESCRIPTION:Un événement de l'Agenda du Libre
-LOCATION:<%= event.address %> <%= event.city.gsub('-', ' ') %>
+DESCRIPTION:<%= strip_tags(event.description).gsub(/\r/, '').gsub /^/, ' ' %>
+LOCATION:<%= event.full_address %>
 END:VEVENT
 <% end %>
 END:VCALENDAR
diff --git a/app/views/events/show.ics.erb b/app/views/events/show.ics.erb
index 4b6adcb9..26c66fec 100644
--- a/app/views/events/show.ics.erb
+++ b/app/views/events/show.ics.erb
@@ -12,7 +12,7 @@ DTEND;TZID=Europe/Paris:<%= event.end_time.strftime '%Y%m%dT%H%M%S' %>
 UID:<%= event.id %>@agendadulibre.org
 SUMMARY:<%= event.title %>
 URL:<%= event_url event %>
-DESCRIPTION:Un événement de l'Agenda du Libre
-LOCATION:<%= event.address %> <%= event.city %>
+DESCRIPTION:<%= strip_tags(event.description).gsub(/\r/, '').gsub /^/, ' ' %>
+LOCATION:<%= event.full_address %>
 END:VEVENT
 END:VCALENDAR