diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/IndexGeneratorJob.java b/indexing-hadoop/src/main/java/io/druid/indexer/IndexGeneratorJob.java
index 20be5549773c..243e724092ef 100644
--- a/indexing-hadoop/src/main/java/io/druid/indexer/IndexGeneratorJob.java
+++ b/indexing-hadoop/src/main/java/io/druid/indexer/IndexGeneratorJob.java
@@ -504,7 +504,8 @@ private void serializeOutIndex(Context context, Bucket bucket, File mergedBase,
       // the String name of it and verify that.  We do a full package-qualified test in order
       // to be as explicit as possible.
       String fsClazz = outputFS.getClass().getName();
-      if ("org.apache.hadoop.fs.s3native.NativeS3FileSystem".equals(fsClazz)) {
+      if ("org.apache.hadoop.fs.s3native.NativeS3FileSystem".equals(fsClazz) ||
+          "com.amazon.ws.emr.hadoop.fs.EmrFileSystem".equals(fsClazz)) {
         loadSpec = ImmutableMap.<String, Object>of(
             "type", "s3_zip",
             "bucket", indexOutURI.getHost(),