diff --git a/user_manual/pim/calendar.rst b/user_manual/pim/calendar.rst
index 10f328b8c..45bed0cd4 100644
--- a/user_manual/pim/calendar.rst
+++ b/user_manual/pim/calendar.rst
@@ -24,9 +24,9 @@ instance, importing is the best way to do so.
 
 .. figure:: ./images/calendar_settings.png
 
-1. Click on the settings-icon labeled with "Settings & Import" at the left-bottom.
+1. Click on the settings-icon labeled with `Settings & Import` at the left-bottom.
 
-2. After clicking on "+ Import Calendar" you can select a calendar file from your
+2. After clicking on `+ Import Calendar` you can select a calendar file from your
 local device to upload.
 
 3. The upload can take some time and depends on how big the calendar you import
@@ -73,29 +73,71 @@ hard drive or delete it forever.
 Subscribe to a Calendar
 ~~~~~~~~~~~~~~~~~~~~~~~
 
-TBD
+You can subscribe to iCal calendars directly inside of your Nextcloud. By
+supporting this interoperable standard (RFC 5545) we made Nextcloud calendar
+compatible to Google Calendar, Apple iCloud and many other calendar-servers
+you can exchange your calendars with.
+
+1. Click on `+ New Subscription` in the left sidebar.
+2. Type in the link of the shared calendar you want to subscribe to.
+
+Finished. Your calendar subscriptions will be updated regularly.
 
 Managing Events
 ---------------
 
-TBD
-
 Create a new event
 ~~~~~~~~~~~~~~~~~~
 
-TBD
+Events can be created by clicking in the area when the event is scheduled.
+In the day- and week-view of the calendar you just click, pull and left your
+cursor over the area when the event is taking place.
 
-Edit an event
-~~~~~~~~~~~~~
+.. figure:: ./images/calendar_new-event_week.gif
 
-TBD
+The month-view only requires a single click into the area of the specific day.
 
-Delete an event
-~~~~~~~~~~~~~~~
+.. figure:: ./images/calendar_new-event_month.gif
 
-TBD
+After that, you can type in the events name (e.g. **Meeting with Lukas**), choose
+the calendar in which you want to choose the event (e.g. **Personal**, **Work**)
+check and concretize the time span or set the event as all-day event.
 
-Share your Calendars & Events
------------------------------
+If you want to edit advanced details such as the **Location**, a **Description**,
+**Attendees**, **Reminders** or to set the event as a repeating-event click on
+the `More...`-button to open the advanced sidebar-editor.
 
-TBD
+.. figure:: ./images/calendar/new-event_sidebar.png
+
+.. note:: If you always want to open the advanced sidebar-editor instead of the
+          simple event editor popup, you can set a `Skip simple event
+          editor`-checkmark in the `Settings & Import`-section of the app.
+
+Clicking on the blue `Create`-button will finally create the event.
+
+Edit or Delete an event
+~~~~~~~~~~~~~~~~~~~~~~~
+
+If you want to edit or delete a specific event, you just need to click on it.
+After that you will be able to re-set all of the events details and open the
+advanced sidebar-editor by clicking on `More...`.
+
+Clicking on the blue `Update`-button will update the event. Clicking on the
+`Cancel`-button will not save your edits.
+
+If you click on the red `Delete`-button the event will be removed from your
+calendar.
+
+Birthday calendar
+-----------------
+
+The birthday calendar is a auto-generated calendar which will automatically
+fetch the birthdays from your contacts.
+
+- You can not delete this calendar by your own. It will be re-generated after
+  some minutes.
+- The only way to edit this calendar is by filing your contacts with birthday
+  dates. You can not directly edit this calendar from the calendar-app.
+
+.. note:: If you do not see the birthday calendar, your Administrator may has
+          disabled this for your server.
diff --git a/user_manual/pim/images/calendar_new-event_month.gif b/user_manual/pim/images/calendar_new-event_month.gif
new file mode 100644
index 000000000..7489b224b
Binary files /dev/null and b/user_manual/pim/images/calendar_new-event_month.gif differ
diff --git a/user_manual/pim/images/calendar_new-event_week.gif b/user_manual/pim/images/calendar_new-event_week.gif
new file mode 100644
index 000000000..e12891280
Binary files /dev/null and b/user_manual/pim/images/calendar_new-event_week.gif differ