diff --git a/base/tks/shared/webapps/tks/WEB-INF/web.xml b/base/tks/shared/webapps/tks/WEB-INF/web.xml
index 5f46c0a664d..c0410907a53 100644
--- a/base/tks/shared/webapps/tks/WEB-INF/web.xml
+++ b/base/tks/shared/webapps/tks/WEB-INF/web.xml
@@ -7,22 +7,6 @@
 
     <display-name>Token Key Service</display-name>
 
-   <servlet>
-      <servlet-name>  tksGetStatus  </servlet-name>
-      <servlet-class> com.netscape.cms.servlet.csadmin.TKSGetStatus  </servlet-class>
-             <init-param><param-name>  GetClientCert  </param-name>
-                         <param-value> false       </param-value> </init-param>
-             <init-param><param-name>  authority   </param-name>
-                         <param-value> tks          </param-value> </init-param>
-             <init-param><param-name>  ID          </param-name>
-                         <param-value> tksGetStatus </param-value> </init-param>
-   </servlet>
-
-   <servlet-mapping>
-      <servlet-name>  tksGetStatus  </servlet-name>
-      <url-pattern>   /admin/tks/getStatus  </url-pattern>
-   </servlet-mapping>
-
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>Account Services</web-resource-name>
diff --git a/base/tks/src/main/java/com/netscape/cms/servlet/csadmin/TKSGetStatus.java b/base/tks/src/main/java/com/netscape/cms/servlet/csadmin/TKSGetStatus.java
index 88049894d44..232bed31f25 100644
--- a/base/tks/src/main/java/com/netscape/cms/servlet/csadmin/TKSGetStatus.java
+++ b/base/tks/src/main/java/com/netscape/cms/servlet/csadmin/TKSGetStatus.java
@@ -17,6 +17,18 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.cms.servlet.csadmin;
 
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
+
+@WebServlet(
+        name = "tksGetStatus",
+        urlPatterns = "/admin/tks/getStatus",
+        initParams = {
+                @WebInitParam(name="GetClientCert", value="false"),
+                @WebInitParam(name="authority",     value="tks"),
+                @WebInitParam(name="ID",            value="tksGetStatus")
+        }
+)
 public class TKSGetStatus extends GetStatus {
     private static final long serialVersionUID = 1L;
 }