diff --git a/bin/idea.bat b/bin/idea.bat
index d7adf43fbb4b..632ae9142b2d 100644
--- a/bin/idea.bat
+++ b/bin/idea.bat
@@ -31,7 +31,7 @@ IF NOT "%IDEA_PROPERTIES%" == "" set IDEA_PROPERTIES_PROPERTY=-Didea.properties.
 SET ACC=
 FOR /F "delims=" %%i in (%IDEA_HOME%\bin\idea.exe.vmoptions) DO call %IDEA_HOME%\bin\append.bat "%%i"
 
-set REQUIRED_IDEA_JVM_ARGS=-Xbootclasspath/p:%IDEA_HOME%/lib/boot.jar %IDEA_PROPERTIES_PROPERTY% %REQUIRED_IDEA_JVM_ARGS%
+set REQUIRED_IDEA_JVM_ARGS=-Xbootclasspath/a:%IDEA_HOME%/lib/boot.jar %IDEA_PROPERTIES_PROPERTY% %REQUIRED_IDEA_JVM_ARGS%
 SET JVM_ARGS=%ACC% %REQUIRED_IDEA_JVM_ARGS%
 
 SET OLD_PATH=%PATH%
diff --git a/bin/idea.sh b/bin/idea.sh
index 635246cafbcd..6438387be61e 100644
--- a/bin/idea.sh
+++ b/bin/idea.sh
@@ -39,7 +39,7 @@ if [ -z "$IDEA_VM_OPTIONS" ]; then
   IDEA_VM_OPTIONS="$IDEA_HOME/bin/idea.vmoptions"
 fi
 
-REQUIRED_JVM_ARGS="-Xbootclasspath/p:../lib/boot.jar $IDEA_PROPERTIES_PROPERTY $REQUIRED_JVM_ARGS"
+REQUIRED_JVM_ARGS="-Xbootclasspath/a:../lib/boot.jar $IDEA_PROPERTIES_PROPERTY $REQUIRED_JVM_ARGS"
 JVM_ARGS=`tr '\n' ' ' < "$IDEA_VM_OPTIONS"`
 JVM_ARGS="$JVM_ARGS $REQUIRED_JVM_ARGS"
 
diff --git a/bin/inspect_diff.bat b/bin/inspect_diff.bat
index 29ff80c9664b..99fea05a2496 100644
--- a/bin/inspect_diff.bat
+++ b/bin/inspect_diff.bat
@@ -32,7 +32,7 @@ IF NOT "%IDEA_PROPERTIES%" == "" set IDEA_PROPERTIES_PROPERTY=-Didea.properties.
 SET ACC=
 FOR /F "delims=" %%i in (%IDEA_HOME%\bin\idea.exe.vmoptions) DO call %IDEA_HOME%\bin\append.bat "%%i"
 
-set REQUIRED_IDEA_JVM_ARGS=-Xbootclasspath/p:%IDEA_HOME%/lib/boot.jar %IDEA_PROPERTIES_PROPERTY% %REQUIRED_IDEA_JVM_ARGS%
+set REQUIRED_IDEA_JVM_ARGS=-Xbootclasspath/a:%IDEA_HOME%/lib/boot.jar %IDEA_PROPERTIES_PROPERTY% %REQUIRED_IDEA_JVM_ARGS%
 SET JVM_ARGS=%ACC% %REQUIRED_IDEA_JVM_ARGS%
 
 SET OLD_PATH=%PATH%
diff --git a/bin/inspect_diff.sh b/bin/inspect_diff.sh
index 3e93408897cb..9bbc5493eb7e 100644
--- a/bin/inspect_diff.sh
+++ b/bin/inspect_diff.sh
@@ -39,7 +39,7 @@ if [ -z "$IDEA_VM_OPTIONS" ]; then
 IDEA_VM_OPTIONS="$IDEA_HOME/bin/idea.vmoptions"
 fi
 
-REQUIRED_JVM_ARGS="-Xbootclasspath/p:../lib/boot.jar $IDEA_PROPERTIES_PROPERTY $REQUIRED_JVM_ARGS"
+REQUIRED_JVM_ARGS="-Xbootclasspath/a:../lib/boot.jar $IDEA_PROPERTIES_PROPERTY $REQUIRED_JVM_ARGS"
 JVM_ARGS=`tr '\n' ' ' < "$IDEA_VM_OPTIONS"`
 JVM_ARGS="$JVM_ARGS $REQUIRED_JVM_ARGS"
 
diff --git a/build/mac/Info.plist b/build/mac/Info.plist
index 3ead989c29aa..6f61b5387dac 100644
--- a/build/mac/Info.plist
+++ b/build/mac/Info.plist
@@ -69,7 +69,7 @@
         <string>true</string>
       </dict>
       <key>VMOptions</key>
-      <string>-Xms16m -Xmx192m -XX:MaxPermSize=120m -Xbootclasspath/p:../lib/boot.jar -ea</string>
+      <string>-Xms16m -Xmx192m -XX:MaxPermSize=120m -Xbootclasspath/a:../lib/boot.jar -ea</string>
       <key>WorkingDirectory</key>
       <string>$APP_PACKAGE/bin</string>
    </dict>