diff --git a/jdk/src/java.base/share/classes/sun/nio/cs/AbstractCharsetProvider.java b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/AbstractCharsetProvider.java
similarity index 99%
rename from jdk/src/java.base/share/classes/sun/nio/cs/AbstractCharsetProvider.java
rename to jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/AbstractCharsetProvider.java
index e10a9400280..972d6593573 100644
--- a/jdk/src/java.base/share/classes/sun/nio/cs/AbstractCharsetProvider.java
+++ b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/AbstractCharsetProvider.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package sun.nio.cs;
+package sun.nio.cs.ext;
 
 import java.lang.ref.SoftReference;
 import java.nio.charset.Charset;
diff --git a/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ExtendedCharsets.java.template b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ExtendedCharsets.java.template
index a25018a1235..19a278f4ba1 100644
--- a/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ExtendedCharsets.java.template
+++ b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ExtendedCharsets.java.template
@@ -35,7 +35,6 @@ import java.nio.charset.spi.CharsetProvider;
 import sun.nio.cs.AbstractCharsetProvider;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
-import sun.nio.cs.AbstractCharsetProvider;
 
 /**
  * Provider for extended charsets.