diff --git a/html/images/sogo/sogo.icalendar.5.add.a.caldav.account.png b/html/images/sogo/macosx.add.caldav.account.png
similarity index 100%
rename from html/images/sogo/sogo.icalendar.5.add.a.caldav.account.png
rename to html/images/sogo/macosx.add.caldav.account.png
diff --git a/html/images/sogo/macosx.add.carddav.account.png b/html/images/sogo/macosx.add.carddav.account.png
new file mode 100644
index 00000000..96562885
Binary files /dev/null and b/html/images/sogo/macosx.add.carddav.account.png differ
diff --git a/html/images/sogo/sogo.icalendar.3.add.other.account.png b/html/images/sogo/macosx.add.other.account.png
similarity index 100%
rename from html/images/sogo/sogo.icalendar.3.add.other.account.png
rename to html/images/sogo/macosx.add.other.account.png
diff --git a/html/images/sogo/sogo.icalendar.4.choose.account.type.png b/html/images/sogo/macosx.choose.account.type.caldav.png
similarity index 100%
rename from html/images/sogo/sogo.icalendar.4.choose.account.type.png
rename to html/images/sogo/macosx.choose.account.type.caldav.png
diff --git a/html/images/sogo/macosx.choose.account.type.carddav.png b/html/images/sogo/macosx.choose.account.type.carddav.png
new file mode 100644
index 00000000..64b15b17
Binary files /dev/null and b/html/images/sogo/macosx.choose.account.type.carddav.png differ
diff --git a/html/images/sogo/sogo.icalendar.2.internet.accounts.png b/html/images/sogo/macosx.internet.accounts.png
similarity index 100%
rename from html/images/sogo/sogo.icalendar.2.internet.accounts.png
rename to html/images/sogo/macosx.internet.accounts.png
diff --git a/html/images/sogo/sogo.icalendar.1.system.preferences.png b/html/images/sogo/macosx.system.preferences.png
similarity index 100%
rename from html/images/sogo/sogo.icalendar.1.system.preferences.png
rename to html/images/sogo/macosx.system.preferences.png
diff --git a/html/index.html b/html/index.html
index 75c62e18..eb8f5ae8 100644
--- a/html/index.html
+++ b/html/index.html
@@ -33,7 +33,8 @@
 <h3 id="configure-mail-client-applications">Configure mail client applications</h3>
 <ul>
 <li><a href="configure.thunderbird.html">Configure Thunderbird as mail client (POP3/IMAP, SMTP and global ldap address book)</a></li>
-<li><a href="sogo.icalendar.html">Add calendar account in iCalendar on Mac OS X</a></li>
+<li><a href="sogo.icalendar.html">Mac OS X: Add calendar account in iCalendar.app</a></li>
+<li><a href="sogo.macosx.contacts.html">Mac OS X: Add contact account in Contacts.app</a></li>
 </ul>
 <h3 id="how-to">How to</h3>
 <ul>
diff --git a/html/sogo-centos-6-mysql.html b/html/sogo-centos-6-mysql.html
index b1809d0b..b528ec67 100644
--- a/html/sogo-centos-6-mysql.html
+++ b/html/sogo-centos-6-mysql.html
@@ -220,7 +220,7 @@ service memcached start
 <p>Open your favourite web browser, access URL: <code>https://[your_server]/SOGo</code>.</p>
 <h2 id="how-to-configure-client-applications">How to configure client applications</h2>
 <h3 id="apple-devices">Apple Devices</h3>
-<p>URL for calendar service: <code>http://[host]/SOGo/dav/[user]/</code></p>
+<p>URL for calendar service: <code>http://[host]/SOGo/dav/[full email address]/</code></p>
 <h2 id="todo">TODO</h2>
 <h2 id="references">References</h2><p style="text-align: center; color: grey;">Document published under a <a href="http://creativecommons.org/licenses/by-nd/3.0/us/" target="_blank">CC BY-ND 3.0</a> license. If you found something wrong, please do <a href="http://www.iredmail.org/contact.html">contact us</a> to fix it.<!-- Google Analytics -->
 <script type="text/javascript">
diff --git a/html/sogo.icalendar.html b/html/sogo.icalendar.html
index dc0d5eb8..b8019a0b 100644
--- a/html/sogo.icalendar.html
+++ b/html/sogo.icalendar.html
@@ -1,7 +1,7 @@
 <html>
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-        <title>Add calendar account in iCalendar on Mac OS X</title>
+        <title>Mac OS X: Add calendar account in iCalendar.app</title>
         <link href="./css/markdown.css" rel="stylesheet"></head>
     </head>
     <body>
@@ -10,19 +10,19 @@
         <a href="http://www.iredmail.org" target="_blank">iRedMail web site</a>
     
         // <a href="./index.html">Document Index</a>
-    </div><h1 id="add-calendar-account-in-icalendar-on-mac-os-x">Add calendar account in iCalendar on Mac OS X</h1>
+    </div><h1 id="mac-os-x-add-calendar-account-in-icalendarapp">Mac OS X: Add calendar account in iCalendar.app</h1>
 <blockquote>
 <p>To use calendar service (CalDAV protocol), you must choose to install
 SOGo groupware during iRedMail installation.</p>
 </blockquote>
 <p>1: Open application <code>System Preferences</code>:</p>
-<p><img alt="" src="./images/sogo/sogo.icalendar.1.system.preferences.png" /></p>
+<p><img alt="" src="./images/sogo/macosx.system.preferences.png" /></p>
 <p>2: Click <code>Internet Accounts</code>:</p>
-<p><img alt="" src="./images/sogo/sogo.icalendar.2.internet.accounts.png" /></p>
+<p><img alt="" src="./images/sogo/macosx.internet.accounts.png" /></p>
 <p>3: on right panel, click <code>Add Other Account</code> at the bottom</p>
-<p><img alt="" src="./images/sogo/sogo.icalendar.3.add.other.account.png" /></p>
+<p><img alt="" src="./images/sogo/macosx.add.other.account.png" /></p>
 <p>4: choose <code>Add a CalDAV account</code> in popup window</p>
-<p><img alt="" src="./images/sogo/sogo.icalendar.4.choose.account.type.png" /></p>
+<p><img alt="" src="./images/sogo/macosx.choose.account.type.caldav.png" /></p>
 <p>5: Fill up the form with your server address and email account credential</p>
 <ul>
 <li>Account Type: <code>Advanced</code></li>
@@ -33,7 +33,7 @@ SOGo groupware during iRedMail installation.</p>
 <li>Port: <code>443</code></li>
 <li>Use SSL: checked</li>
 </ul>
-<p><img alt="" src="./images/sogo/sogo.icalendar.5.add.a.caldav.account.png" /></p><p style="text-align: center; color: grey;">Document published under a <a href="http://creativecommons.org/licenses/by-nd/3.0/us/" target="_blank">CC BY-ND 3.0</a> license. If you found something wrong, please do <a href="http://www.iredmail.org/contact.html">contact us</a> to fix it.<!-- Google Analytics -->
+<p><img alt="" src="./images/sogo/macosx.add.caldav.account.png" /></p><p style="text-align: center; color: grey;">Document published under a <a href="http://creativecommons.org/licenses/by-nd/3.0/us/" target="_blank">CC BY-ND 3.0</a> license. If you found something wrong, please do <a href="http://www.iredmail.org/contact.html">contact us</a> to fix it.<!-- Google Analytics -->
 <script type="text/javascript">
     var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
     document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
diff --git a/html/sogo.macosx.contacts.html b/html/sogo.macosx.contacts.html
new file mode 100644
index 00000000..c7e115fa
--- /dev/null
+++ b/html/sogo.macosx.contacts.html
@@ -0,0 +1,43 @@
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+        <title>Mac OS X: Add contact account in Contacts.app</title>
+        <link href="./css/markdown.css" rel="stylesheet"></head>
+    </head>
+    <body>
+    
+    <div id="navigation">
+        <a href="http://www.iredmail.org" target="_blank">iRedMail web site</a>
+    
+        // <a href="./index.html">Document Index</a>
+    </div><h1 id="mac-os-x-add-contact-account-in-contactsapp">Mac OS X: Add contact account in Contacts.app</h1>
+<blockquote>
+<p>To use contact service (CardDAV protocol), you must choose to install
+SOGo groupware during iRedMail installation.</p>
+</blockquote>
+<p>1: Open application <code>System Preferences</code>:</p>
+<p><img alt="" src="./images/sogo/macosx.system.preferences.png" /></p>
+<p>2: Click <code>Internet Accounts</code>:</p>
+<p><img alt="" src="./images/sogo/macosx.internet.accounts.png" /></p>
+<p>3: on right panel, click <code>Add Other Account</code> at the bottom</p>
+<p><img alt="" src="./images/sogo/macosx.add.other.account.png" /></p>
+<p>4: choose <code>Add a CalDAV account</code> in popup window</p>
+<p><img alt="" src="./images/sogo/macosx.choose.account.type.carddav.png" /></p>
+<p>5: Fill up the form with your server address and email account credential</p>
+<ul>
+<li>User Name: <code>your full email address</code></li>
+<li>Password: <code>password of your email account</code></li>
+<li>Server Address: <code>https://[server name or IP address]/SOGo/dav/[your full email address]</code></li>
+</ul>
+<p><img alt="" src="./images/sogo/macosx.add.carddav.account.png" /></p><p style="text-align: center; color: grey;">Document published under a <a href="http://creativecommons.org/licenses/by-nd/3.0/us/" target="_blank">CC BY-ND 3.0</a> license. If you found something wrong, please do <a href="http://www.iredmail.org/contact.html">contact us</a> to fix it.<!-- Google Analytics -->
+<script type="text/javascript">
+    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+    document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+</script>
+<script type="text/javascript">
+    try {
+        var pageTracker = _gat._getTracker("UA-3293801-14");
+        pageTracker._trackPageview();
+    } catch(err) {}
+</script>
+</body></html>
\ No newline at end of file
diff --git a/integrations/sogo-centos-6-mysql.md b/integrations/sogo-centos-6-mysql.md
index 6a41bc91..1364ba4c 100644
--- a/integrations/sogo-centos-6-mysql.md
+++ b/integrations/sogo-centos-6-mysql.md
@@ -209,7 +209,7 @@ Open your favourite web browser, access URL: `https://[your_server]/SOGo`.
 
 ### Apple Devices
 
-URL for calendar service: `http://[host]/SOGo/dav/[user]/`
+URL for calendar service: `http://[host]/SOGo/dav/[full email address]/`
 
 ## TODO
 
diff --git a/mua/sogo.icalendar.md b/mua/sogo.icalendar.md
index e6ef20ce..a38b28cd 100644
--- a/mua/sogo.icalendar.md
+++ b/mua/sogo.icalendar.md
@@ -1,23 +1,23 @@
-# Add calendar account in iCalendar on Mac OS X
+# Mac OS X: Add calendar account in iCalendar.app
 
 > To use calendar service (CalDAV protocol), you must choose to install
 > SOGo groupware during iRedMail installation.
 
 1: Open application `System Preferences`:
 
-![](./images/sogo/sogo.icalendar.1.system.preferences.png)
+![](./images/sogo/macosx.system.preferences.png)
 
 2: Click `Internet Accounts`:
 
-![](./images/sogo/sogo.icalendar.2.internet.accounts.png)
+![](./images/sogo/macosx.internet.accounts.png)
 
 3: on right panel, click `Add Other Account` at the bottom
 
-![](./images/sogo/sogo.icalendar.3.add.other.account.png)
+![](./images/sogo/macosx.add.other.account.png)
 
 4: choose `Add a CalDAV account` in popup window
 
-![](./images/sogo/sogo.icalendar.4.choose.account.type.png)
+![](./images/sogo/macosx.choose.account.type.caldav.png)
 
 5: Fill up the form with your server address and email account credential
 
@@ -29,4 +29,4 @@
 * Port: `443`
 * Use SSL: checked
 
-![](./images/sogo/sogo.icalendar.5.add.a.caldav.account.png)
+![](./images/sogo/macosx.add.caldav.account.png)
diff --git a/mua/sogo.macosx.contacts.md b/mua/sogo.macosx.contacts.md
new file mode 100644
index 00000000..a95bbe97
--- /dev/null
+++ b/mua/sogo.macosx.contacts.md
@@ -0,0 +1,28 @@
+# Mac OS X: Add contact account in Contacts.app
+
+> To use contact service (CardDAV protocol), you must choose to install
+> SOGo groupware during iRedMail installation.
+
+1: Open application `System Preferences`:
+
+![](./images/sogo/macosx.system.preferences.png)
+
+2: Click `Internet Accounts`:
+
+![](./images/sogo/macosx.internet.accounts.png)
+
+3: on right panel, click `Add Other Account` at the bottom
+
+![](./images/sogo/macosx.add.other.account.png)
+
+4: choose `Add a CardDAV account` in popup window
+
+![](./images/sogo/macosx.choose.account.type.carddav.png)
+
+5: Fill up the form with your server address and email account credential
+
+* User Name: `your full email address`
+* Password: `password of your email account`
+* Server Address: `https://[server name or IP address]/SOGo/dav/[your full email address]`
+
+![](./images/sogo/macosx.add.carddav.account.png)
