diff --git a/Extension/CHANGELOG.md b/Extension/CHANGELOG.md
index 5971e3c929..502b51e56c 100644
--- a/Extension/CHANGELOG.md
+++ b/Extension/CHANGELOG.md
@@ -1,5 +1,9 @@
 # C/C++ for Visual Studio Code Change Log
 
+## Version 1.1.2: November 17, 2020
+### Bug Fix
+* Fix resolution of `${fileDirname}` with `cppbuild` tasks. [#6386](https://github.com/microsoft/vscode-cpptools/issues/6386)
+
 ## Version 1.1.1: November 9, 2020
 ### Bug Fixes
 * Fix cpptools binaries sometimes not getting installed on Windows. [#6453](https://github.com/microsoft/vscode-cpptools/issues/6453)
diff --git a/Extension/package.json b/Extension/package.json
index 8bd30d30bd..000f3f27e1 100644
--- a/Extension/package.json
+++ b/Extension/package.json
@@ -2,7 +2,7 @@
   "name": "cpptools",
   "displayName": "C/C++",
   "description": "C/C++ IntelliSense, debugging, and code browsing.",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "publisher": "ms-vscode",
   "icon": "LanguageCCPP_color_128x.png",
   "readme": "README.md",
diff --git a/Extension/src/LanguageServer/cppBuildTaskProvider.ts b/Extension/src/LanguageServer/cppBuildTaskProvider.ts
index f31c729b54..75d7d8a6cb 100644
--- a/Extension/src/LanguageServer/cppBuildTaskProvider.ts
+++ b/Extension/src/LanguageServer/cppBuildTaskProvider.ts
@@ -396,7 +396,7 @@ class CustomBuildTaskTerminal implements Pseudoterminal {
         const file: string = editor.document.fileName;
         return {
             "file": file,
-            "fileDirname": fileDir.uri.fsPath,
+            "fileDirname": path.parse(file).dir,
             "fileBasenameNoExtension": path.parse(file).name,
             "workspaceFolder": fileDir.uri.fsPath
         };