diff --git a/user_manual/calendars.rst b/user_manual/calendars.rst
index a638a4a71..48b2f1449 100644
--- a/user_manual/calendars.rst
+++ b/user_manual/calendars.rst
@@ -16,15 +16,19 @@ link for CalDav access.
 Synchronising Calendars with CalDav
 -----------------------------------
 
-You can access your calendars with CalDAV-compatible programs like
+Assuming you access your web interface via an address like this::
+
+  http://ADDRESS
+
+Then you can access your calendars with CalDAV-compatible programs like
 Kontact, Evolution, Thunderbird using the following URL::
 
-  http://ADDRESS/apps/calendar/caldav.php
+  http://ADDRESS/remote.php/caldav
 
 To use the ownCloud calendar with Apple iCal you will need to use the following
 URL, including the trailing slash::
 
-  http://ADDRESS/apps/calendar/caldav.php/principals/username/ 
+  http://ADDRESS/remote.php/caldav/principals/username/ 
 
 Mozilla Lightning users need to this URL scheme::
 
@@ -35,7 +39,11 @@ Mozilla Lightning users need to this URL scheme::
 .. figure:: images/calendar_caldav.png
 
    Example for a simple calendar: The default calendar is always
-   called "defaultcalendar", and the users' name here is "oc".
+   called "defaultcalendar", and the users' name here is "test".
+   The full URL (which on the picture can't be seen because of the
+   short edit field) is then::
+
+  https://localhost/owncloud/remote.php/caldav/calendars/test/defaultcalendar
 
 .. _URL-encoding: http://en.wikipedia.org/wiki/Percent-encoding
 
diff --git a/user_manual/images/calendar_caldav.png b/user_manual/images/calendar_caldav.png
index 0f7e7d5c9..2461e02a2 100644
Binary files a/user_manual/images/calendar_caldav.png and b/user_manual/images/calendar_caldav.png differ
diff --git a/user_manual/images/calendar_createevent.png b/user_manual/images/calendar_createevent.png
index d58bcf3f7..e692764f8 100644
Binary files a/user_manual/images/calendar_createevent.png and b/user_manual/images/calendar_createevent.png differ
diff --git a/user_manual/images/calendar_export.png b/user_manual/images/calendar_export.png
index 2122e9eba..f2fe2be58 100644
Binary files a/user_manual/images/calendar_export.png and b/user_manual/images/calendar_export.png differ
diff --git a/user_manual/images/calendar_import.png b/user_manual/images/calendar_import.png
index 35c8e4dff..be93af483 100644
Binary files a/user_manual/images/calendar_import.png and b/user_manual/images/calendar_import.png differ
diff --git a/user_manual/images/calendar_manage-calendars.png b/user_manual/images/calendar_manage-calendars.png
index 81f8ef156..c1ca01cd1 100644
Binary files a/user_manual/images/calendar_manage-calendars.png and b/user_manual/images/calendar_manage-calendars.png differ