diff --git a/src/Bundle.js b/src/Bundle.js
index ff820d1e7ea..dc7d277c395 100644
--- a/src/Bundle.js
+++ b/src/Bundle.js
@@ -122,7 +122,13 @@ class Bundle {
 
     // If this is the main entry file, use the output file option as the name if provided.
     if (isMainEntry && entryAsset.options.outFile) {
-      name = entryAsset.options.outFile;
+      let extname = Path.extname(entryAsset.options.outFile);
+      if (extname) {
+        ext = this.entryAsset ? extname : ext;
+        name = Path.basename(entryAsset.options.outFile, extname);
+      } else {
+        name = entryAsset.options.outFile;
+      }
     }
 
     // If this is an entry asset, don't hash. Return a relative path