diff --git a/make/data/charsetmapping/IBM930.c2b b/make/data/charsetmapping/IBM930.c2b
index 88754763fe3..72107424104 100644
--- a/make/data/charsetmapping/IBM930.c2b
+++ b/make/data/charsetmapping/IBM930.c2b
@@ -32,11 +32,6 @@
 547d    92ca
 53da    9b7e
 446e    f86f
-#
-# we should use this one instead of the 4260<-ff0d
-#4260	2212  
-4260	ff0d
-#
 426A	00A6
 43A1	301C
 444A	2014
diff --git a/make/data/charsetmapping/IBM930.map b/make/data/charsetmapping/IBM930.map
index 4b9dad9526b..7939e795bdf 100644
--- a/make/data/charsetmapping/IBM930.map
+++ b/make/data/charsetmapping/IBM930.map
@@ -25,13 +25,6 @@
 #      4260 <--> 2212
 #      426A <--> 00A6
 #
-#      Warning:
-#      "our old" implementation seems agree with above "new" mappings
-#      except the entries   4260 <-> 2212. To keep the "compatbility"
-#      with the "old" implementation, I changed the entries "temporarily"
-#      4260 <-> 2212
-#      4260 <-  ff0d
-#
 00	0000
 01	0001
 02	0002
@@ -407,8 +400,7 @@ FF	009F
 425D	FF09
 425E	FF1B
 425F	FFE2
-#4260	FF0D
-4260	2212
+4260	FF0D
 4261	FF0F
 426A	FFE4
 426B	FF0C
diff --git a/test/jdk/sun/nio/cs/mapping/CoderTest.java b/test/jdk/sun/nio/cs/mapping/CoderTest.java
index 05913a40535..2f766736743 100644
--- a/test/jdk/sun/nio/cs/mapping/CoderTest.java
+++ b/test/jdk/sun/nio/cs/mapping/CoderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,7 @@
  */
 
 /* @test
-   @bug 4691554 6221056 6380723 6404504 6419565 6529796 8301119
+   @bug 4691554 6221056 6380723 6404504 6419565 6529796 8301119 8368845
    @summary Test the supported New I/O coders
    @modules jdk.charsets
    @run main CoderTest
diff --git a/test/jdk/sun/nio/cs/mapping/ConverterTest.java b/test/jdk/sun/nio/cs/mapping/ConverterTest.java
index be8df03230c..8d33670b0a5 100644
--- a/test/jdk/sun/nio/cs/mapping/ConverterTest.java
+++ b/test/jdk/sun/nio/cs/mapping/ConverterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,8 @@
  * @summary test Bug 4199484
  * @modules jdk.charsets
  * @run main ConverterTest
- * @bug 4199484 4199599 4199601 4199602 4159519 4201529 4199604 4201532 4947038 6217210
+ * @bug 4199484 4199599 4199601 4199602 4159519 4201529 4199604 4201532 4947038
+ *      6217210 8368845
 */
 
 import java.util.*;
diff --git a/test/jdk/sun/nio/cs/mapping/Cp930.b2c b/test/jdk/sun/nio/cs/mapping/Cp930.b2c
index 67cc93fd628..3cd45375e2d 100644
--- a/test/jdk/sun/nio/cs/mapping/Cp930.b2c
+++ b/test/jdk/sun/nio/cs/mapping/Cp930.b2c
@@ -340,7 +340,7 @@ F9	0039
 0E425D0F    FF09
 0E425E0F    FF1B
 0E425F0F    FFE2
-0E42600F    2212
+0E42600F    FF0D
 0E42610F    FF0F
 0E426A0F    FFE4
 0E426B0F    FF0C
diff --git a/test/jdk/sun/nio/cs/mapping/TestConv.java b/test/jdk/sun/nio/cs/mapping/TestConv.java
index 2f4ea424f6c..3bd0b15a7d3 100644
--- a/test/jdk/sun/nio/cs/mapping/TestConv.java
+++ b/test/jdk/sun/nio/cs/mapping/TestConv.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,7 @@
  */
 
 /* @test
-   @bug 4179153 4652234 6529796
+   @bug 4179153 4652234 6529796 8368845
    @summary Read code mapping table and check code conversion
    @modules jdk.charsets
  */