diff --git a/src/java/org/apache/lucene/index/IndexFileNames.java b/src/java/org/apache/lucene/index/IndexFileNames.java
index 4c7cdbac165..6e01228c598 100644
--- a/src/java/org/apache/lucene/index/IndexFileNames.java
+++ b/src/java/org/apache/lucene/index/IndexFileNames.java
@@ -189,6 +189,8 @@ final class IndexFileNames {
    * STORE_INDEX_EXTENSIONS).
    */
   static final boolean isDocStoreFile(String fileName) {
+    if (fileName.endsWith(COMPOUND_FILE_STORE_EXTENSION))
+      return true;
     for(int i=0;i<STORE_INDEX_EXTENSIONS.length;i++)
       if (fileName.endsWith(STORE_INDEX_EXTENSIONS[i]))
         return true;
diff --git a/src/java/org/apache/lucene/index/IndexWriter.java b/src/java/org/apache/lucene/index/IndexWriter.java
index 3481de4fe63..041c6f8156f 100644
--- a/src/java/org/apache/lucene/index/IndexWriter.java
+++ b/src/java/org/apache/lucene/index/IndexWriter.java
@@ -363,6 +363,7 @@ public class IndexWriter {
    */
   public void setUseCompoundFile(boolean value) {
     getLogMergePolicy().setUseCompoundFile(value);
+    getLogMergePolicy().setUseCompoundDocStore(value);
   }
 
   /** Expert: Set the Similarity implementation used by this IndexWriter.