diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag b/maven-repository-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag
index d184992da..6febd7f06 100644
--- a/maven-repository-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag
+++ b/maven-repository-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag
@@ -18,8 +18,12 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ attribute name="action" required="true" %>
 <%@ attribute name="namespace" required="true" %>
-<ww:url id="currentUrl" />
-<ww:url action="${action}" namespace="${namespace}" id="url" />
+<c:set var="currentUrl">
+  <ww:url />
+</c:set>
+<c:set var="url">
+  <ww:url action="${action}" namespace="${namespace}" />
+</c:set>
 <c:choose>
   <c:when test="${currentUrl == url}">
     <strong>
diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/web.xml b/maven-repository-webapp/src/main/webapp/WEB-INF/web.xml
index d364847cc..90b5fdde9 100644
--- a/maven-repository-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/maven-repository-webapp/src/main/webapp/WEB-INF/web.xml
@@ -14,11 +14,10 @@
   ~ limitations under the License.
   -->
 
-<!DOCTYPE web-app PUBLIC
-    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-    "http://java.sun.com/dtd/web-app_2_3.dtd" >
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee" version="2.4"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
 
-<web-app>
   <display-name>Maven Repository Manager</display-name>
 
   <!-- TODO: remove if we use the new xwork integration
@@ -70,9 +69,4 @@
   <listener>
     <listener-class>org.codehaus.plexus.xwork.PlexusLifecycleListener</listener-class>
   </listener>
-
-  <welcome-file-list>
-    <welcome-file>index.action</welcome-file>
-    <welcome-file>index.jsp</welcome-file>
-  </welcome-file-list>
 </web-app>