diff --git a/libraries/tools/kotlin-stdlib-docs/build.gradle b/libraries/tools/kotlin-stdlib-docs/build.gradle
index 50d03fc5171..47f05d0588c 100644
--- a/libraries/tools/kotlin-stdlib-docs/build.gradle
+++ b/libraries/tools/kotlin-stdlib-docs/build.gradle
@@ -50,10 +50,10 @@ task callDokka(type: Exec, dependsOn: setupCallDokka) {
         def logFile = file("$buildDir/dokka.log")
         standardOutput = new org.apache.tools.ant.util.TeeOutputStream(System.out, new FileOutputStream(logFile))
 
-        pKotlinBig().commentOutSinceKotlinForPathWalkOption.call()
+        pKotlinBig().commentOutSinceKotlinForNewEnums.call()
     }
     doLast {
-        pKotlinBig().uncommentSinceKotlinForPathWalkOption.call()
+        pKotlinBig().uncommentSinceKotlinForNewEnums.call()
     }
 }
 
diff --git a/libraries/tools/kotlin-stdlib-docs/kotlin_big/build.gradle b/libraries/tools/kotlin-stdlib-docs/kotlin_big/build.gradle
index 66536dd3845..c57dbce436d 100644
--- a/libraries/tools/kotlin-stdlib-docs/kotlin_big/build.gradle
+++ b/libraries/tools/kotlin-stdlib-docs/kotlin_big/build.gradle
@@ -67,24 +67,32 @@ project.extensions.kotlin_root = kotlinRootDir
 project.extensions.kotlin_libs = kotlinLibsDir
 
 // TODO: Eliminate this workaround when KT-52977 gets fixed in the Kotlin compiler used in Dokka
-final File pathWalkOption = new File("$kotlinRootDir/libraries/stdlib/jdk7/src/kotlin/io/path/PathWalkOption.kt")
+final List<File> enumsToComment = [
+        "$kotlinRootDir/libraries/stdlib/jdk7/src/kotlin/io/path/PathWalkOption.kt",
+        "$kotlinRootDir/libraries/stdlib/jdk7/src/kotlin/io/path/CopyActionResult.kt",
+        "$kotlinRootDir/libraries/stdlib/jdk7/src/kotlin/io/path/OnErrorResult.kt",
+].collect { new File(it) }
 
-project.extensions.commentOutSinceKotlinForPathWalkOption = {
-  final List<String> lines = pathWalkOption.readLines()
-  for (def i = 0; i < lines.size(); i++) {
-    if (lines[i] == "@SinceKotlin(\"1.7\")") {
-      lines[i] = "//" + lines[i]
+project.extensions.commentOutSinceKotlinForNewEnums = {
+  for (file in enumsToComment) {
+    final List<String> lines = file.readLines()
+    for (def i = 0; i < lines.size(); i++) {
+      if (lines[i].startsWith("@SinceKotlin")) {
+        lines[i] = "//" + lines[i]
+      }
     }
+    file.write(String.join("\n", lines))
   }
-  pathWalkOption.write(String.join("\n", lines))
 }
 
-project.extensions.uncommentSinceKotlinForPathWalkOption = {
-  final List<String> lines = pathWalkOption.readLines()
-  for (def i = 0; i < lines.size(); i++) {
-    if (lines[i] == "//@SinceKotlin(\"1.7\")") {
-      lines[i] = lines[i].substring(2)
+project.extensions.uncommentSinceKotlinForNewEnums = {
+  for (file in enumsToComment) {
+    final List<String> lines = file.readLines()
+    for (def i = 0; i < lines.size(); i++) {
+      if (lines[i].startsWith("//@SinceKotlin")) {
+        lines[i] = lines[i].substring(2)
+      }
     }
+    file.write(String.join("\n", lines))
   }
-  pathWalkOption.write(String.join("\n", lines))
 }
\ No newline at end of file