diff --git a/NEWS b/NEWS
index 9c47c6c0d..9804468fd 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@ New Features
 
 Enhancements
  - updated Ukrainian translation
+ - now possible to use memcached over a UNIX socket
 
 Bug Fixes
  - alarms for tasks now depend on the start date and instead of the due date
diff --git a/SoObjects/SOGo/SOGoCache.m b/SoObjects/SOGo/SOGoCache.m
index 8617a9c29..b3ecd694e 100644
--- a/SoObjects/SOGo/SOGoCache.m
+++ b/SoObjects/SOGo/SOGoCache.m
@@ -127,7 +127,10 @@ static memcached_st *handle = NULL;
                 servers
 		  = memcached_servers_parse([memcachedServerName UTF8String]);
 
-              memcached_server_push(handle, servers);
+              if ([memcachedServerName hasPrefix:@"/"])
+                  memcached_server_add_unix_socket(handle, [memcachedServerName UTF8String]);
+              else
+                  memcached_server_push(handle, servers);
             }
         }
     }