diff --git a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85SOGoAccess b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85SOGoAccess
index 077fe1e..6545fee 100644
--- a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85SOGoAccess
+++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85SOGoAccess
@@ -13,6 +13,12 @@
 ProxyPass /SOGo http://127.0.0.1:{$sogod{'TCPPort'}}/SOGo
 ProxyPassReverse /SOGo http://127.0.0.1:{$sogod{'TCPPort'}}/SOGo
 SetEnvIf Host (.*) REQUEST_HOST=$1
+
+# iOS auto discovery
+RedirectMatch ^/principals/users/(.*)$ /SOGo/dav/$1
+RedirectMatch ^/principals/$ /SOGo/dav/
+RedirectMatch ^/.well-known/(caldav|carddav)$ /SOGo/dav/
+
 <Location /SOGo>
     order deny,allow
     deny from all
diff --git a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85SOGoAppleWorkArround b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85SOGoAppleWorkArround
index f85f30a..9e6354e 100644
--- a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85SOGoAppleWorkArround
+++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85SOGoAppleWorkArround
@@ -16,7 +16,9 @@ if (($sogoStatus eq 'enabled') && ($appleStatus eq 'enabled')){
     ProxyPreserveHost On
     ProxyPassInterpolateEnv On
     RewriteEngine On
-    RewriteRule /principals(.*) /\$1 [L,R]
+    RedirectMatch ^/principals/users/(.*)\$ /\$1
+    RedirectMatch ^/principals/\$ /
+    RedirectMatch ^/.well-known/(caldav|carddav)\$ /
     RewriteRule /SOGo/dav(.*) /\$1 [L,R]
     ProxyPass / http://127.0.0.1:$sogoPort/SOGo/dav/ interpolate