diff --git a/jdk/make/src/classes/build/tools/module/boot.modules b/jdk/make/src/classes/build/tools/module/boot.modules
index 9763b9287d4..d51fbfb4913 100644
--- a/jdk/make/src/classes/build/tools/module/boot.modules
+++ b/jdk/make/src/classes/build/tools/module/boot.modules
@@ -11,7 +11,6 @@ java.naming
 java.prefs
 java.rmi
 java.scripting
-java.security.acl
 java.security.jgss
 java.security.sasl
 java.smartcardio
diff --git a/jdk/src/java.security.acl/share/classes/java/security/acl/Acl.java b/jdk/src/java.base/share/classes/java/security/acl/Acl.java
similarity index 100%
rename from jdk/src/java.security.acl/share/classes/java/security/acl/Acl.java
rename to jdk/src/java.base/share/classes/java/security/acl/Acl.java
diff --git a/jdk/src/java.security.acl/share/classes/java/security/acl/AclEntry.java b/jdk/src/java.base/share/classes/java/security/acl/AclEntry.java
similarity index 100%
rename from jdk/src/java.security.acl/share/classes/java/security/acl/AclEntry.java
rename to jdk/src/java.base/share/classes/java/security/acl/AclEntry.java
diff --git a/jdk/src/java.security.acl/share/classes/java/security/acl/AclNotFoundException.java b/jdk/src/java.base/share/classes/java/security/acl/AclNotFoundException.java
similarity index 100%
rename from jdk/src/java.security.acl/share/classes/java/security/acl/AclNotFoundException.java
rename to jdk/src/java.base/share/classes/java/security/acl/AclNotFoundException.java
diff --git a/jdk/src/java.security.acl/share/classes/java/security/acl/Group.java b/jdk/src/java.base/share/classes/java/security/acl/Group.java
similarity index 100%
rename from jdk/src/java.security.acl/share/classes/java/security/acl/Group.java
rename to jdk/src/java.base/share/classes/java/security/acl/Group.java
diff --git a/jdk/src/java.security.acl/share/classes/java/security/acl/LastOwnerException.java b/jdk/src/java.base/share/classes/java/security/acl/LastOwnerException.java
similarity index 100%
rename from jdk/src/java.security.acl/share/classes/java/security/acl/LastOwnerException.java
rename to jdk/src/java.base/share/classes/java/security/acl/LastOwnerException.java
diff --git a/jdk/src/java.security.acl/share/classes/java/security/acl/NotOwnerException.java b/jdk/src/java.base/share/classes/java/security/acl/NotOwnerException.java
similarity index 100%
rename from jdk/src/java.security.acl/share/classes/java/security/acl/NotOwnerException.java
rename to jdk/src/java.base/share/classes/java/security/acl/NotOwnerException.java
diff --git a/jdk/src/java.security.acl/share/classes/java/security/acl/Owner.java b/jdk/src/java.base/share/classes/java/security/acl/Owner.java
similarity index 100%
rename from jdk/src/java.security.acl/share/classes/java/security/acl/Owner.java
rename to jdk/src/java.base/share/classes/java/security/acl/Owner.java
diff --git a/jdk/src/java.security.acl/share/classes/java/security/acl/Permission.java b/jdk/src/java.base/share/classes/java/security/acl/Permission.java
similarity index 100%
rename from jdk/src/java.security.acl/share/classes/java/security/acl/Permission.java
rename to jdk/src/java.base/share/classes/java/security/acl/Permission.java
diff --git a/jdk/src/java.security.acl/share/classes/java/security/acl/package-info.java b/jdk/src/java.base/share/classes/java/security/acl/package-info.java
similarity index 100%
rename from jdk/src/java.security.acl/share/classes/java/security/acl/package-info.java
rename to jdk/src/java.base/share/classes/java/security/acl/package-info.java
diff --git a/jdk/src/java.security.acl/share/classes/sun/security/acl/AclEntryImpl.java b/jdk/src/java.base/share/classes/sun/security/acl/AclEntryImpl.java
similarity index 100%
rename from jdk/src/java.security.acl/share/classes/sun/security/acl/AclEntryImpl.java
rename to jdk/src/java.base/share/classes/sun/security/acl/AclEntryImpl.java
diff --git a/jdk/src/java.security.acl/share/classes/sun/security/acl/AclImpl.java b/jdk/src/java.base/share/classes/sun/security/acl/AclImpl.java
similarity index 100%
rename from jdk/src/java.security.acl/share/classes/sun/security/acl/AclImpl.java
rename to jdk/src/java.base/share/classes/sun/security/acl/AclImpl.java
diff --git a/jdk/src/java.security.acl/share/classes/sun/security/acl/AllPermissionsImpl.java b/jdk/src/java.base/share/classes/sun/security/acl/AllPermissionsImpl.java
similarity index 100%
rename from jdk/src/java.security.acl/share/classes/sun/security/acl/AllPermissionsImpl.java
rename to jdk/src/java.base/share/classes/sun/security/acl/AllPermissionsImpl.java
diff --git a/jdk/src/java.security.acl/share/classes/sun/security/acl/GroupImpl.java b/jdk/src/java.base/share/classes/sun/security/acl/GroupImpl.java
similarity index 100%
rename from jdk/src/java.security.acl/share/classes/sun/security/acl/GroupImpl.java
rename to jdk/src/java.base/share/classes/sun/security/acl/GroupImpl.java
diff --git a/jdk/src/java.security.acl/share/classes/sun/security/acl/OwnerImpl.java b/jdk/src/java.base/share/classes/sun/security/acl/OwnerImpl.java
similarity index 100%
rename from jdk/src/java.security.acl/share/classes/sun/security/acl/OwnerImpl.java
rename to jdk/src/java.base/share/classes/sun/security/acl/OwnerImpl.java
diff --git a/jdk/src/java.security.acl/share/classes/sun/security/acl/PermissionImpl.java b/jdk/src/java.base/share/classes/sun/security/acl/PermissionImpl.java
similarity index 100%
rename from jdk/src/java.security.acl/share/classes/sun/security/acl/PermissionImpl.java
rename to jdk/src/java.base/share/classes/sun/security/acl/PermissionImpl.java
diff --git a/jdk/src/java.security.acl/share/classes/sun/security/acl/PrincipalImpl.java b/jdk/src/java.base/share/classes/sun/security/acl/PrincipalImpl.java
similarity index 100%
rename from jdk/src/java.security.acl/share/classes/sun/security/acl/PrincipalImpl.java
rename to jdk/src/java.base/share/classes/sun/security/acl/PrincipalImpl.java
diff --git a/jdk/src/java.security.acl/share/classes/sun/security/acl/WorldGroupImpl.java b/jdk/src/java.base/share/classes/sun/security/acl/WorldGroupImpl.java
similarity index 100%
rename from jdk/src/java.security.acl/share/classes/sun/security/acl/WorldGroupImpl.java
rename to jdk/src/java.base/share/classes/sun/security/acl/WorldGroupImpl.java