diff --git a/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml b/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml
index 5d3234c148e..9a6c27a47f3 100644
--- a/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml
+++ b/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml
@@ -102,21 +102,6 @@
                          <param-value> /services.template </param-value> </init-param>
    </servlet>
 
-   <servlet>
-      <servlet-name>  ocspOCSP  </servlet-name>
-      <servlet-class> com.netscape.cms.servlet.ocsp.OCSPOCSPServlet  </servlet-class>
-             <init-param><param-name>  GetClientCert  </param-name>
-                         <param-value> false       </param-value> </init-param>
-             <init-param><param-name>  AuthzMgr    </param-name>
-                         <param-value> BasicAclAuthz </param-value> </init-param>
-             <init-param><param-name>  authority   </param-name>
-                         <param-value> ocsp        </param-value> </init-param>
-             <init-param><param-name>  ID          </param-name>
-                         <param-value> ocspOCSP    </param-value> </init-param>
-             <init-param><param-name>  resourceID  </param-name>
-                         <param-value> certServer.ee.request.ocsp </param-value> </init-param>
-   </servlet>
-
    <servlet>
       <servlet-name>  ocspDownloadPKCS12  </servlet-name>
       <servlet-class> com.netscape.cms.servlet.csadmin.DownloadPKCS12  </servlet-class>
@@ -253,16 +238,6 @@
       <url-pattern>   /agent/header  </url-pattern>
    </servlet-mapping>
 
-   <servlet-mapping>
-      <servlet-name>  ocspOCSP  </servlet-name>
-      <url-pattern>   /ee/ocsp  </url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>  ocspOCSP  </servlet-name>
-      <url-pattern>   /ee/ocsp/*  </url-pattern>
-   </servlet-mapping>
-
    <servlet-mapping>
       <servlet-name>  services </servlet-name>
       <url-pattern>   /services  </url-pattern>
diff --git a/base/ocsp/src/main/java/com/netscape/cms/servlet/ocsp/OCSPOCSPServlet.java b/base/ocsp/src/main/java/com/netscape/cms/servlet/ocsp/OCSPOCSPServlet.java
index c79707c290d..edb12fc01d3 100644
--- a/base/ocsp/src/main/java/com/netscape/cms/servlet/ocsp/OCSPOCSPServlet.java
+++ b/base/ocsp/src/main/java/com/netscape/cms/servlet/ocsp/OCSPOCSPServlet.java
@@ -17,6 +17,23 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.cms.servlet.ocsp;
 
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
+
+@WebServlet(
+        name = "ocspOCSP",
+        urlPatterns = {
+                "/ee/ocsp",
+                "/ee/ocsp/*"
+        },
+        initParams = {
+                @WebInitParam(name="GetClientCert", value="false"),
+                @WebInitParam(name="AuthzMgr",      value="BasicAclAuthz"),
+                @WebInitParam(name="authority",     value="ocsp"),
+                @WebInitParam(name="ID",            value="ocspOCSP"),
+                @WebInitParam(name="resourceID",    value="certServer.ee.request.ocsp")
+        }
+)
 public class OCSPOCSPServlet extends OCSPServlet {
     private static final long serialVersionUID = 1L;
 }