diff --git a/.gitignore b/.gitignore
index 93228e37e5b..c8fbd74c6fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 corretto-build
+commitId.txt
diff --git a/build.gradle b/build.gradle
index 599fb8b376a..ccf3914b142 100644
--- a/build.gradle
+++ b/build.gradle
@@ -172,6 +172,7 @@ project(':openjdksrc') {
                     'README.md',
                     'THIRD_PARTY_README',
                     'ASSEMBLY_EXCEPTION',
+                    'commitId.txt',
                     'version.txt',
                     'amazon-cacerts'
         }
diff --git a/installers/linux/alpine/tar/build.gradle b/installers/linux/alpine/tar/build.gradle
index 31e1d77f00a..a1d21caf5a4 100644
--- a/installers/linux/alpine/tar/build.gradle
+++ b/installers/linux/alpine/tar/build.gradle
@@ -102,6 +102,7 @@ task copyBuildResults() {
                 include 'ASSEMBLY_EXCEPTION'
                 include 'LICENSE'
                 include 'THIRD_PARTY_README'
+                include 'commitId.txt'
                 include 'version.txt'
             }
             into destination
diff --git a/installers/linux/universal/tar/build.gradle b/installers/linux/universal/tar/build.gradle
index 6caa612f8a7..b206bf512e8 100644
--- a/installers/linux/universal/tar/build.gradle
+++ b/installers/linux/universal/tar/build.gradle
@@ -105,6 +105,7 @@ task copyBuildResults() {
                 include 'ASSEMBLY_EXCEPTION'
                 include 'LICENSE'
                 include 'THIRD_PARTY_README'
+                include 'commitId.txt'
                 include 'version.txt'
             }
             into destination
diff --git a/installers/mac/tar/build.gradle b/installers/mac/tar/build.gradle
index f757b30ff92..fd96fa16d27 100644
--- a/installers/mac/tar/build.gradle
+++ b/installers/mac/tar/build.gradle
@@ -134,6 +134,7 @@ task prepareArtifacts {
                 include 'ASSEMBLY_EXCEPTION'
                 include 'LICENSE'
                 include 'THIRD_PARTY_README'
+                include 'commitId.txt'
                 include 'version.txt'
                 into "Contents/Home"
             }
diff --git a/installers/windows/zip/build.gradle b/installers/windows/zip/build.gradle
index 36e56edb929..6ec5900f9a1 100644
--- a/installers/windows/zip/build.gradle
+++ b/installers/windows/zip/build.gradle
@@ -80,12 +80,16 @@ task copyImage() {
         }
         // Copy version.txt into JDK
         copy {
-            from "$buildRoot/version.txt"
+            from "$buildRoot"
+            include "commitId.txt"
+            include "version.txt"
             into "$buildRoot/build/j2sdk-image"
         }
         // Copy version.txt into JRE
         copy {
-            from "$buildRoot/version.txt"
+            from "$buildRoot"
+            include "commitId.txt"
+            include "version.txt"
             into "$buildRoot/build/j2re-image"
         }
     }