diff --git a/base/tools/src/main/java/com/netscape/cmstools/client/ClientCertRemoveCLI.java b/base/tools/src/main/java/com/netscape/cmstools/client/ClientCertRemoveCLI.java
index b24fbdcd8db..4e7d2f308f7 100644
--- a/base/tools/src/main/java/com/netscape/cmstools/client/ClientCertRemoveCLI.java
+++ b/base/tools/src/main/java/com/netscape/cmstools/client/ClientCertRemoveCLI.java
@@ -26,10 +26,12 @@
 
 /**
  * @author Endi S. Dewata
+ * @deprecated Replaced by NSSCertRemoveCLI.
  */
+@Deprecated
 public class ClientCertRemoveCLI extends CommandCLI {
 
-    public static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ClientCertRemoveCLI.class);
+    public static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ClientCertRemoveCLI.class);
 
     public ClientCLI clientCLI;
 
@@ -46,6 +48,8 @@ public void printHelp() {
     @Override
     public void execute(CommandLine cmd) throws Exception {
 
+        logger.warn("The pki " + getFullName() + " has been deprecated. Use pki nss-cert-del instead.");
+
         String[] cmdArgs = cmd.getArgs();
 
         if (cmdArgs.length != 1) {
diff --git a/docs/changes/v11.5.0/Tools-Changes.adoc b/docs/changes/v11.5.0/Tools-Changes.adoc
index 16fccec8249..bf89957adbc 100644
--- a/docs/changes/v11.5.0/Tools-Changes.adoc
+++ b/docs/changes/v11.5.0/Tools-Changes.adoc
@@ -32,3 +32,8 @@ The `--months-valid` option has been deprecated.
 == New pki nss-cert-del CLI ==
 
 The `pki nss-cert-del` command has been added to delete a certificate from NSS database.
+
+== Deprecate pki client-cert-del ==
+
+The `pki client-cert-del` command has been deprecated.
+Use `pki nss-cert-del` command instead.