diff --git a/src/Hackspace/Bundle/CalciferBundle/Controller/TagController.php b/src/Hackspace/Bundle/CalciferBundle/Controller/TagController.php
index dfb63f5..1d0c43b 100755
--- a/src/Hackspace/Bundle/CalciferBundle/Controller/TagController.php
+++ b/src/Hackspace/Bundle/CalciferBundle/Controller/TagController.php
@@ -71,6 +71,7 @@ class TagController extends Controller
         if ($format == 'ics') {
             $calendar = new Calendar();
             $calendar->setProdId('-//My Company//Cool Calendar App//EN');
+            $calendar->setTimeZone(new \DateTimeZone('Europe/Berlin'));
 
             foreach ($entities as $entity) {
                 /** @var Event $entity */
@@ -81,6 +82,7 @@ class TagController extends Controller
                 $event->setSummary($entity->summary);
                 $event->setDescription($entity->description);
                 $event->setUrl($entity->url);
+                $event->setUid($entity->slug);
                 if ($entity->location instanceof Location) {
                     $location = new \Jsvrcek\ICS\Model\Description\Location();
                     $location->setName($entity->location->name);
diff --git a/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/index.html.twig b/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/index.html.twig
index 60a4816..b159874 100755
--- a/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/index.html.twig
+++ b/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/index.html.twig
@@ -26,6 +26,9 @@
                 {% if tag|default(false) %} für Tag „{{ tag.name }}“{% endif %}
                 {% if location|default(false) %} für Ort „{{ location.name }}“ <a class="location-edit" href="{{ path("location_edit",{slug:location.slug}) }}"><i class="ui icon edit inverted green circular link"></i> </a> {% endif %}
             </h1>
+            {% if tag|default(false) %}
+                <a href="{{ path('tag_show',{'slug' : tag.slug }) }}.ics"><i class="icon calendar"></i>Link zur Kalenderdatei</a>
+            {% endif %}
             {% if location|default(false) %}
                 {% if (location.description|length > 0) or location.hasAddress() %}
                     <div id="location-description" class="ui message green">