diff --git a/.idea/libraries/Snappy_Java.xml b/.idea/libraries/Snappy_Java.xml
index 105634f744b8..f00f00cf6c65 100644
--- a/.idea/libraries/Snappy_Java.xml
+++ b/.idea/libraries/Snappy_Java.xml
@@ -1,12 +1,11 @@
 <component name="libraryTable">
   <library name="Snappy-Java">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/snappy-java-1.1.0-M3.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/snappy-java-1.0.5.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/src/snappy-java-1.1.0-M3-src.zip!/snappy-java-1.1.0-M3/src/main/java" />
-      <root url="jar://$PROJECT_DIR$/lib/src/snappy-java-1.1.0-M3-src.zip!/snappy-java-1.1.0-M3/src/main/resources" />
+      <root url="jar://$PROJECT_DIR$/lib/src/snappy-java-1.0.5.zip!/snappy-java-1.0.5/src/main/java" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/lib/required_for_dist.txt b/lib/required_for_dist.txt
index 2fa9a3cb0e8a..5362c645a037 100644
--- a/lib/required_for_dist.txt
+++ b/lib/required_for_dist.txt
@@ -35,7 +35,7 @@ picocontainer.jar
 resolver.jar
 sanselan-0.98-snapshot.jar
 serviceMessages.jar
-snappy-java-1.1.0-M3.jar
+snappy-java-1.0.5.jar
 trove4j.jar
 velocity.jar
 winp-1.17-patched.jar
diff --git a/lib/snappy-java-1.0.5.jar b/lib/snappy-java-1.0.5.jar
new file mode 100644
index 000000000000..6dc413df20d4
Binary files /dev/null and b/lib/snappy-java-1.0.5.jar differ
diff --git a/lib/snappy-java-1.1.0-M3.jar b/lib/snappy-java-1.1.0-M3.jar
deleted file mode 100644
index 40f4231091f6..000000000000
Binary files a/lib/snappy-java-1.1.0-M3.jar and /dev/null differ
diff --git a/lib/src/snappy-java-1.1.0-M3-src.zip b/lib/src/snappy-java-1.0.5.zip
similarity index 73%
rename from lib/src/snappy-java-1.1.0-M3-src.zip
rename to lib/src/snappy-java-1.0.5.zip
index b1c022aff0fa..24b703a1527b 100644
Binary files a/lib/src/snappy-java-1.1.0-M3-src.zip and b/lib/src/snappy-java-1.0.5.zip differ
diff --git a/platform/lang-impl/src/com/intellij/psi/stubs/StubUpdatingIndex.java b/platform/lang-impl/src/com/intellij/psi/stubs/StubUpdatingIndex.java
index 5eda23fb7d58..4dcd9e661f54 100644
--- a/platform/lang-impl/src/com/intellij/psi/stubs/StubUpdatingIndex.java
+++ b/platform/lang-impl/src/com/intellij/psi/stubs/StubUpdatingIndex.java
@@ -50,7 +50,7 @@ public class StubUpdatingIndex extends CustomImplementationFileBasedIndexExtensi
 
   public static final ID<Integer, SerializedStubTree> INDEX_ID = ID.create("Stubs");
 
-  private static final int VERSION = 23;
+  private static final int VERSION = 24;
 
   private static final DataExternalizer<SerializedStubTree> KEY_EXTERNALIZER = new DataExternalizer<SerializedStubTree>() {
     @Override
diff --git a/platform/platform-impl/src/com/intellij/idea/StartupUtil.java b/platform/platform-impl/src/com/intellij/idea/StartupUtil.java
index eb54502b7996..c05df8fdb349 100644
--- a/platform/platform-impl/src/com/intellij/idea/StartupUtil.java
+++ b/platform/platform-impl/src/com/intellij/idea/StartupUtil.java
@@ -52,8 +52,7 @@ import java.util.List;
 public class StartupUtil {
   @NonNls public static final String NO_SPLASH = "nosplash";
 
-  public static final boolean NO_SNAPPY = SystemProperties.getBooleanProperty("idea.no.snappy", false) ||
-                                          SystemInfo.isMac && SystemInfo.is32Bit;  // todo[maxim] drop once available
+  public static final boolean NO_SNAPPY = SystemProperties.getBooleanProperty("idea.no.snappy", false);
 
   static boolean isHeadless;