diff --git a/CHANGES.txt b/CHANGES.txt
index c040bfd0b02..48af54c2e36 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -352,6 +352,9 @@ Bug Fixes
 40. SOLR-965: Better error message when <pingQuery> is not configured.
     (Mark Miller via hossman)
 
+41. SOLR-1135: Java replication creates Snapshot in the directory where Solr was launched (Jianhan Guo via shalin)
+
+
 Other Changes
 ----------------------
  1. Upgraded to Lucene 2.4.0 (yonik)
diff --git a/src/java/org/apache/solr/handler/SnapShooter.java b/src/java/org/apache/solr/handler/SnapShooter.java
index e0645d0e183..4d3a439f8ab 100644
--- a/src/java/org/apache/solr/handler/SnapShooter.java
+++ b/src/java/org/apache/solr/handler/SnapShooter.java
@@ -42,6 +42,7 @@ public class SnapShooter {
 
   public SnapShooter(SolrCore core) {
     solrCore = core;
+    snapDir = core.getDataDir();
   }
 
   void createSnapAsync(final Collection<String> files) {