2 files changed, 3 insertions, 1 deletions

diff --git a/src/WixToolset.Core.WindowsInstaller/Decompile/DecompileMsiOrMsmCommand.cs b/src/WixToolset.Core.WindowsInstaller/Decompile/DecompileMsiOrMsmCommand.cs
index d622dbb2..474847be 100644
--- a/src/WixToolset.Core.WindowsInstaller/Decompile/DecompileMsiOrMsmCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Decompile/DecompileMsiOrMsmCommand.cs
@@ -46,7 +46,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
                     // extract the files from the cabinets
                     if (!String.IsNullOrEmpty(this.Context.ExtractFolder) && !this.Context.SuppressExtractCabinets)
                     {
-                        var fileDirectory = Path.Combine(this.Context.ExtractFolder, "File");
+                        var fileDirectory = String.IsNullOrEmpty(this.Context.CabinetExtractFolder) ? Path.Combine(this.Context.ExtractFolder, "File") : this.Context.CabinetExtractFolder;
 
                         var extractCommand = new ExtractCabinetsCommand(output, database, this.Context.DecompilePath, fileDirectory, this.Context.IntermediateFolder, this.Context.TreatProductAsModule);
                         extractCommand.Execute();
diff --git a/src/WixToolset.Core/DecompileContext.cs b/src/WixToolset.Core/DecompileContext.cs
index b697c3cf..c6902117 100644
--- a/src/WixToolset.Core/DecompileContext.cs
+++ b/src/WixToolset.Core/DecompileContext.cs
@@ -25,6 +25,8 @@ namespace WixToolset.Core
 
         public string ExtractFolder { get; set; }
 
+        public string CabinetExtractFolder { get; set; }
+
         public string BaseSourcePath { get; set; }
 
         public string IntermediateFolder { get; set; }