diff --git a/conf/nginx-primaryonly.conf b/conf/nginx-primaryonly.conf
index d3d09da5..321194ad 100644
--- a/conf/nginx-primaryonly.conf
+++ b/conf/nginx-primaryonly.conf
@@ -8,6 +8,7 @@
 	# ownCloud configuration.
 	rewrite ^/cloud$ /cloud/ redirect;
 	rewrite ^/cloud/$ /cloud/index.php;
+	rewrite ^/cloud/(contacts|calendar|files)$ /cloud/index.php/apps/$1/ redirect;
 	rewrite ^(/cloud/core/doc/[^\/]+/)$ $1/index.html;
 	location /cloud/ {
 		alias /usr/local/lib/owncloud/;
diff --git a/management/templates/index.html b/management/templates/index.html
index a95c1c8e..a37644ce 100644
--- a/management/templates/index.html
+++ b/management/templates/index.html
@@ -92,17 +92,13 @@
               </ul>
             </li>
             <li class="dropdown active">
-              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Mail <b class="caret"></b></a>
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Mail/Sync <b class="caret"></b></a>
               <ul class="dropdown-menu">
-                <li><a href="#mail-guide" onclick="return show_panel(this);">Instructions</a></li>
+                <li><a href="#mail-guide" onclick="return show_panel(this);">Mail Instructions</a></li>
+                <li><a href="#sync_guide" onclick="return show_panel(this);">Contacts/Calendar</a></li>
+                <li class="divider"></li>
                 <li><a href="#users" onclick="return show_panel(this);">Users</a></li>
                 <li><a href="#aliases" onclick="return show_panel(this);">Aliases</a></li>
-                <!--<li><a href="#">Another action</a></li>
-                <li><a href="#">Something else here</a></li>
-                <li class="divider"></li>
-                <li class="dropdown-header">Nav header</li>
-                <li><a href="#">Separated link</a></li>
-                <li><a href="#">One more separated link</a></li>-->
               </ul>
             </li>
           </ul>
@@ -142,6 +138,10 @@
       {% include "aliases.html" %}
       </div>
 
+      <div id="panel_sync_guide" class="container panel">
+      {% include "sync-guide.html" %}
+      </div>
+
       <hr>
 
       <footer>
diff --git a/management/templates/mail-guide.html b/management/templates/mail-guide.html
index 29da523f..c535c09a 100644
--- a/management/templates/mail-guide.html
+++ b/management/templates/mail-guide.html
@@ -3,12 +3,12 @@
 <div class="container">
 	<h2>Checking and Sending Mail</h2>
 
-	<p>You can use either webmail, IMAP/SMTP, or Exchange/ActiveSync to access your mail. Optionally you can store your contacts on this box too.</p>
+	<p>You can use either webmail, IMAP/SMTP, or Exchange/ActiveSync to access your mail.</p>
 
 	<hr>
 
 	<div class="row">
-		<div class="col-sm-6">
+		<div class="col-md-6">
 			<h4>How to log in</h4>
 
 			<p>Your username and password are the same no matter how you check your mail:</p>
@@ -18,17 +18,14 @@
 			<tr><th>Password:</th> <td>Your mail password.</td></tr>
 			</table>
 		</div>
+	</div>
 
+	<div class="row">
 		<div class="col-sm-6">
 			<h4>Webmail</h4>
 
 			<p>Your webmail site is <a href="https://{{hostname}}/mail">https://{{hostname}}/mail</a>.</p>
-
-			<h4>Contacts</h4>
-
-			<p>Edit your contacts at <a href="https://{{hostname}}/cloud">https://{{hostname}}/cloud</a>.</p>
 		</div>
-
 	</div>
 
 	<div class="row">
@@ -46,7 +43,7 @@
 			<tr><th>SMTP</th> <td>587</td> <td>STARTTLS</td></tr>
 			</table>
 
-			<p>In addition to setting up your email, you&rsquo;ll also need to install an app like <a href="https://play.google.com/store/apps/details?id=org.dmfs.carddav.sync">CardDAV-Sync free beta</a> to store your contacts on your box.</p>
+			<p>In addition to setting up your email, you&rsquo;ll also need to set up <a href="#sync_guide" onclick="return show_panel(this);">contacts and calendar synchronization</a>.</p>
 		</div>
 
 		<div class="col-sm-6">
@@ -59,7 +56,7 @@
 			<tr><th>Options</th> <td>Secure Connection</td></tr>
 			</table>
 
-			<p>Your contacts should be automatically synced to this box when you use this method.</p>
+			<p>Your device should also provide a contacts list and calendar that syncs to this box when you use this method.</p>
 		</div>
 	</div>
 </div>
diff --git a/management/templates/sync-guide.html b/management/templates/sync-guide.html
new file mode 100644
index 00000000..6324ac91
--- /dev/null
+++ b/management/templates/sync-guide.html
@@ -0,0 +1,48 @@
+<div class="container">
+	<h2>Contacts &amp; Calendar Synchronization</h2>
+
+	<p>This box can hold your contacts and calendar, just like it holds your email.</p>
+
+	<hr>
+
+	<div class="row">
+		<div class="col-sm-6">
+			<h4>In your browser</h4>
+
+			<p>You can edit your contacts and calendar from your web browser.</p>
+
+			<table class="table">
+			<thead><tr><th>For...</th> <th>Visit this URL</th></tr></thead>
+			<tr><td>Contacts</td> <td><a href="https://{{hostname}}/cloud/contacts">https://{{hostname}}/cloud/contacts</a></td></tr>
+			<tr><td>Calendar</td> <td><a href="https://{{hostname}}/cloud/calendar">https://{{hostname}}/cloud/calendar</a></td></tr>
+			</table>
+
+			<p>Log in settings are the same as with <a href="#mail-guide" onclick="return show_panel(this);">mail</a>: your
+			complete email address and your mail password.</p>
+		</div>
+
+		<div class="col-sm-6">
+			<h4>On your mobile device</h4>
+
+			<p>If you set up your <a href="#mail-guide" onclick="return show_panel(this);">mail</a> using Exchange/ActiveSync,
+			your contacts and calendar may already appear on your device.</p>
+			<p>Otherwise, here are some apps that can synchronize your contacts and calendar to your Android phone.</p>
+
+			<table class="table">
+			<thead><tr><th>For...</th> <th>Use...</th></tr></thead>
+			<tr><td>Contacts</td> <td><a href="https://play.google.com/store/apps/details?id=org.dmfs.carddav.sync">CardDAV-Sync free beta</a> (free)</td></tr>
+			<tr><td>Calendar</td> <td><a href="https://play.google.com/store/apps/details?id=org.dmfs.caldav.lib">CalDAV-Sync</a> ($2.89)</td></tr>
+			</table>
+
+			<p>Use the following settings:</p>
+
+			<table class="table">
+			<tr><td>Account Type</td> <td>CardDAV or CalDAV</td></tr>
+			<tr><td>Server Name</td> <td>{{hostname}}</td></tr>
+			<tr><td>Use SSL</td> <td>Yes</td></tr>
+			<tr><td>Username</td> <td>Your complete email address.</td></tr>
+			<tr><td>Password</td> <td>Your mail password.</td></tr>
+			</table>
+		</div>
+	</div>
+</div>