diff --git a/pkg/osutil/paths.go b/pkg/osutil/paths.go
index 5595ff4fe..67a17bdd4 100644
--- a/pkg/osutil/paths.go
+++ b/pkg/osutil/paths.go
@@ -31,7 +31,10 @@ func HomeDir() string {
 }
 
 func CacheDir() string {
-	if runtime.GOOS == "windows" || runtime.GOOS == "darwin" {
+	switch runtime.GOOS {
+	case "darwin":
+		return filepath.Join(HomeDir(), "Library", "Caches", "Camlistore")
+	case "windows":
 		panic("CacheDir not implemented on OS == " + runtime.GOOS)
 	}
 	return filepath.Join(HomeDir(), ".cache")