diff --git a/app/views/calendars/show.ics.erb b/app/views/calendars/show.ics.erb
index 8d3126f..a94b11b 100644
--- a/app/views/calendars/show.ics.erb
+++ b/app/views/calendars/show.ics.erb
@@ -1,3 +1,9 @@
+
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:http://www.example.com/calendarapplication/
+METHOD:PUBLISH
 <% @calendar.calentries.each do |entry| %>
 <%= render entry %>
 <% end %>
+END:VCALENDAR
diff --git a/app/views/calentries/_calentry.ics.erb b/app/views/calentries/_calentry.ics.erb
index dead832..b70b0ae 100644
--- a/app/views/calentries/_calentry.ics.erb
+++ b/app/views/calentries/_calentry.ics.erb
@@ -1,5 +1,11 @@
-  <%= calentry.start %>
-  <%= calentry.ende %>
-  <%= calentry.summary %>
-  <%= calentry.typ %>
-
+BEGIN:VEVENT
+UID:4610<%= calentry.id %>@fet.at
+ORGANIZER;CN="Peter Schlechter, Example Inc.":MAILTO:peter@fet.at
+LOCATION:Vienna
+SUMMARY:<%= calentry.summary%>
+DESCRIPTION:<%= calentry.summary%>
+CLASS:PUBLIC
+DTSTART:<%= calentry.start.strftime "%Y%m%dT%H%M%S" %>
+DTEND:<%= calentry.ende.strftime "%Y%m%dT%H%M%S" %>
+DTSTAMP:<%= calentry.start.strftime "%Y%m%dT%H%M%S" %>
+END:VEVENT
diff --git a/app/views/calentries/show.ics.erb b/app/views/calentries/show.ics.erb
index 908d8dc..ad4422d 100644
--- a/app/views/calentries/show.ics.erb
+++ b/app/views/calentries/show.ics.erb
@@ -1,25 +1,11 @@
-<p id="notice"><%= notice %></p>
-
-<p>
-  <b>Start:</b>
-  <%= @calentry.start %>
-</p>
-
-<p>
-  <b>Ende:</b>
-  <%= @calentry.ende %>
-</p>
-
-<p>
-  <b>Summary:</b>
-  <%= @calentry.summary %>
-</p>
-
-<p>
-  <b>Typ:</b>
-  <%= @calentry.typ %>
-</p>
-
-
-<%= link_to 'Edit', edit_calentry_path(@calentry) %> |
-<%= link_to 'Back', calentries_path %>
+BEGIN:VEVENT
+UID:4610<%= calentry.id $>@fet.at
+ORGANIZER;CN="Peter Schlechter, Example Inc.":MAILTO:peter@fet.at
+LOCATION:Vienna
+SUMMARY:<%= calentry.summary%>
+DESCRIPTION:<%= calentry.summary%>
+CLASS:PUBLIC
+DTSTART:<%= calentry.start.strftime "%Y%m%dT%H%M%S" %>
+DTEND:<%= calentry.ende.strftime "%Y%m%dT%H%M%S" %>
+DTSTAMP:<%= calentry.start.strftime "%Y%m%dT%H%M%S" %>
+END:VEVENT