diff --git a/bin/idea.properties b/bin/idea.properties
index 53795e2a67b3..be34798ed34e 100644
--- a/bin/idea.properties
+++ b/bin/idea.properties
@@ -15,12 +15,12 @@
 #---------------------------------------------------------------------
 # Uncomment this option if you want to customize path to user installed plugins folder. Make sure you're using forward slashes.
 #---------------------------------------------------------------------
-# idea.plugins.path=${user.home}/.@@settings_dir@@/config/plugins
+# idea.plugins.path=${idea.config.path}/plugins
 
 #---------------------------------------------------------------------
 # Uncomment this option if you want to customize path to IDE logs folder. Make sure you're using forward slashes.
 #---------------------------------------------------------------------
-# idea.log.path=${user.home}/.@@settings_dir@@/system/log
+# idea.log.path=${idea.system.path}/log
 
 #---------------------------------------------------------------------
 # Maximum file size (kilobytes) IDE should provide code assistance for.
diff --git a/platform/util/src/com/intellij/openapi/application/PathManager.java b/platform/util/src/com/intellij/openapi/application/PathManager.java
index 2f2418b2ca35..9518fdc32334 100644
--- a/platform/util/src/com/intellij/openapi/application/PathManager.java
+++ b/platform/util/src/com/intellij/openapi/application/PathManager.java
@@ -79,7 +79,8 @@ public class PathManager {
     else {
       ourHomePath = getHomePathFor(PathManager.class);
       if (ourHomePath == null) {
-        String advice = SystemInfo.isMac ? "reinstall the software." : "make sure bin/idea.properties is present in the installation directory.";
+        String advice = SystemInfo.isMac ? "reinstall the software."
+                                         : "make sure bin/idea.properties is present in the installation directory.";
         throw new RuntimeException("Could not find installation home path. Please " + advice);
       }
     }
@@ -186,8 +187,8 @@ public class PathManager {
     if (System.getProperty(PROPERTY_PLUGINS_PATH) != null) {
       ourPluginsPath = getAbsolutePath(trimPathQuotes(System.getProperty(PROPERTY_PLUGINS_PATH)));
     }
-    else if (PATHS_SELECTOR != null) {
-      ourPluginsPath = platformPath(PATHS_SELECTOR, "Library/Application Support", CONFIG_FOLDER + File.separatorChar + PLUGINS_FOLDER);
+    if (SystemInfo.isMac && PATHS_SELECTOR != null) {
+      ourPluginsPath = getUserHome() + File.separator + "Library/Application Support" + File.separator + PATHS_SELECTOR;
     }
     else {
       ourPluginsPath = getConfigPath() + File.separatorChar + PLUGINS_FOLDER;
@@ -235,8 +236,8 @@ public class PathManager {
     if (System.getProperty(PROPERTY_LOG_PATH) != null) {
       ourLogPath = getAbsolutePath(trimPathQuotes(System.getProperty(PROPERTY_LOG_PATH)));
     }
-    else if (PATHS_SELECTOR != null) {
-      ourLogPath = platformPath(PATHS_SELECTOR, "Library/Logs", SYSTEM_FOLDER + File.separatorChar + LOG_DIRECTORY);
+    else if (SystemInfo.isMac && PATHS_SELECTOR != null) {
+      ourLogPath = getUserHome() + File.separator + "Library/Logs" + File.separator + PATHS_SELECTOR;
     }
     else {
       ourLogPath = getSystemPath() + File.separatorChar + LOG_DIRECTORY;