diff --git a/pom.xml b/pom.xml
index 7d4ee333..e83d5714 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,9 +39,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>3.1.0</version>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>6.0.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/src/main/java/com/samskivert/servlet/HttpErrorException.java b/src/main/java/com/samskivert/servlet/HttpErrorException.java
index a202259c..1a0ef639 100644
--- a/src/main/java/com/samskivert/servlet/HttpErrorException.java
+++ b/src/main/java/com/samskivert/servlet/HttpErrorException.java
@@ -5,7 +5,7 @@
 
 package com.samskivert.servlet;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * An http error exception is thrown by servlet services when they wish to fail
diff --git a/src/main/java/com/samskivert/servlet/JDBCTableSiteIdentifier.java b/src/main/java/com/samskivert/servlet/JDBCTableSiteIdentifier.java
index edcc8c61..3f99fdcb 100644
--- a/src/main/java/com/samskivert/servlet/JDBCTableSiteIdentifier.java
+++ b/src/main/java/com/samskivert/servlet/JDBCTableSiteIdentifier.java
@@ -17,7 +17,7 @@ import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Iterator;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import com.samskivert.io.PersistenceException;
 
diff --git a/src/main/java/com/samskivert/servlet/MessageManager.java b/src/main/java/com/samskivert/servlet/MessageManager.java
index 92b7b554..2172a0f4 100644
--- a/src/main/java/com/samskivert/servlet/MessageManager.java
+++ b/src/main/java/com/samskivert/servlet/MessageManager.java
@@ -9,7 +9,7 @@ import java.io.IOException;
 import java.text.MessageFormat;
 import java.util.*;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import com.samskivert.text.MessageUtil;
 import com.samskivert.util.StringUtil;
diff --git a/src/main/java/com/samskivert/servlet/SiteIdentifier.java b/src/main/java/com/samskivert/servlet/SiteIdentifier.java
index 4cbefb87..eb95b1f9 100644
--- a/src/main/java/com/samskivert/servlet/SiteIdentifier.java
+++ b/src/main/java/com/samskivert/servlet/SiteIdentifier.java
@@ -6,7 +6,7 @@
 package com.samskivert.servlet;
 
 import java.util.Iterator;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 /**
  * Responsible for determining the unique site identifier based on information available in the
diff --git a/src/main/java/com/samskivert/servlet/SiteIdentifiers.java b/src/main/java/com/samskivert/servlet/SiteIdentifiers.java
index d4c5a4ea..fee1179f 100644
--- a/src/main/java/com/samskivert/servlet/SiteIdentifiers.java
+++ b/src/main/java/com/samskivert/servlet/SiteIdentifiers.java
@@ -8,7 +8,7 @@ package com.samskivert.servlet;
 import java.util.Collections;
 import java.util.Iterator;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 /**
  * {@link SiteIdentifier} utility methods.
diff --git a/src/main/java/com/samskivert/servlet/SiteResourceLoader.java b/src/main/java/com/samskivert/servlet/SiteResourceLoader.java
index 432d5feb..fd31c6ff 100644
--- a/src/main/java/com/samskivert/servlet/SiteResourceLoader.java
+++ b/src/main/java/com/samskivert/servlet/SiteResourceLoader.java
@@ -15,7 +15,7 @@ import java.security.PrivilegedAction;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import com.samskivert.util.HashIntMap;
 
diff --git a/src/main/java/com/samskivert/servlet/user/UserManager.java b/src/main/java/com/samskivert/servlet/user/UserManager.java
index ae15d67e..b2d5c3bf 100644
--- a/src/main/java/com/samskivert/servlet/user/UserManager.java
+++ b/src/main/java/com/samskivert/servlet/user/UserManager.java
@@ -6,9 +6,9 @@
 package com.samskivert.servlet.user;
 
 import java.util.Properties;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import com.samskivert.io.PersistenceException;
 import com.samskivert.jdbc.ConnectionProvider;
diff --git a/src/main/java/com/samskivert/servlet/util/CookieUtil.java b/src/main/java/com/samskivert/servlet/util/CookieUtil.java
index c66492c0..f7f4d339 100644
--- a/src/main/java/com/samskivert/servlet/util/CookieUtil.java
+++ b/src/main/java/com/samskivert/servlet/util/CookieUtil.java
@@ -5,9 +5,9 @@
 
 package com.samskivert.servlet.util;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * Utility methods for dealing with cookies.
diff --git a/src/main/java/com/samskivert/servlet/util/ParameterUtil.java b/src/main/java/com/samskivert/servlet/util/ParameterUtil.java
index 5f953ebd..ada7c410 100644
--- a/src/main/java/com/samskivert/servlet/util/ParameterUtil.java
+++ b/src/main/java/com/samskivert/servlet/util/ParameterUtil.java
@@ -14,7 +14,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import com.samskivert.util.ArrayIntSet;
 import com.samskivert.util.IntSet;
diff --git a/src/main/java/com/samskivert/servlet/util/RequestUtils.java b/src/main/java/com/samskivert/servlet/util/RequestUtils.java
index 52acb8af..af02d8f7 100644
--- a/src/main/java/com/samskivert/servlet/util/RequestUtils.java
+++ b/src/main/java/com/samskivert/servlet/util/RequestUtils.java
@@ -7,7 +7,7 @@ package com.samskivert.servlet.util;
 
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import com.samskivert.util.StringUtil;
 
diff --git a/src/main/java/com/samskivert/velocity/Application.java b/src/main/java/com/samskivert/velocity/Application.java
index a5c6109b..2578b938 100644
--- a/src/main/java/com/samskivert/velocity/Application.java
+++ b/src/main/java/com/samskivert/velocity/Application.java
@@ -8,9 +8,9 @@ package com.samskivert.velocity;
 import java.util.Locale;
 import java.util.Properties;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.velocity.app.Velocity;
 
diff --git a/src/main/java/com/samskivert/velocity/DispatcherServlet.java b/src/main/java/com/samskivert/velocity/DispatcherServlet.java
index a65a41fc..fcf7fd79 100644
--- a/src/main/java/com/samskivert/velocity/DispatcherServlet.java
+++ b/src/main/java/com/samskivert/velocity/DispatcherServlet.java
@@ -11,12 +11,12 @@ import java.io.UnsupportedEncodingException;
 import java.util.HashMap;
 import java.util.Properties;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.velocity.Template;
 import org.apache.velocity.context.Context;
diff --git a/src/main/java/com/samskivert/velocity/FormTool.java b/src/main/java/com/samskivert/velocity/FormTool.java
index 5e863871..bb9fb093 100644
--- a/src/main/java/com/samskivert/velocity/FormTool.java
+++ b/src/main/java/com/samskivert/velocity/FormTool.java
@@ -5,7 +5,7 @@
 
 package com.samskivert.velocity;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import com.samskivert.servlet.util.HTMLUtil;
 import com.samskivert.servlet.util.ParameterUtil;
diff --git a/src/main/java/com/samskivert/velocity/I18nTool.java b/src/main/java/com/samskivert/velocity/I18nTool.java
index a1ab97f2..53811f8b 100644
--- a/src/main/java/com/samskivert/velocity/I18nTool.java
+++ b/src/main/java/com/samskivert/velocity/I18nTool.java
@@ -10,7 +10,7 @@ import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import com.samskivert.servlet.MessageManager;
 import com.samskivert.util.StringUtil;
diff --git a/src/main/java/com/samskivert/velocity/InvocationContext.java b/src/main/java/com/samskivert/velocity/InvocationContext.java
index 6d34895e..78c64af5 100644
--- a/src/main/java/com/samskivert/velocity/InvocationContext.java
+++ b/src/main/java/com/samskivert/velocity/InvocationContext.java
@@ -7,8 +7,8 @@ package com.samskivert.velocity;
 
 import java.util.Enumeration;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
diff --git a/src/main/java/com/samskivert/velocity/ServletContextLogger.java b/src/main/java/com/samskivert/velocity/ServletContextLogger.java
index 8bc3aa7d..2119e3d8 100644
--- a/src/main/java/com/samskivert/velocity/ServletContextLogger.java
+++ b/src/main/java/com/samskivert/velocity/ServletContextLogger.java
@@ -5,7 +5,7 @@
 
 package com.samskivert.velocity;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.apache.velocity.runtime.RuntimeServices;
 import org.apache.velocity.runtime.log.LogChute;
diff --git a/src/main/java/com/samskivert/velocity/ServletContextResourceLoader.java b/src/main/java/com/samskivert/velocity/ServletContextResourceLoader.java
index 09a5a541..eef65aa5 100644
--- a/src/main/java/com/samskivert/velocity/ServletContextResourceLoader.java
+++ b/src/main/java/com/samskivert/velocity/ServletContextResourceLoader.java
@@ -6,7 +6,7 @@
 package com.samskivert.velocity;
 
 import java.io.InputStream;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.apache.commons.collections.ExtendedProperties;
 import org.apache.velocity.exception.ResourceNotFoundException;
diff --git a/src/main/java/com/samskivert/velocity/SiteResourceManager.java b/src/main/java/com/samskivert/velocity/SiteResourceManager.java
index 9615ade4..17f6b1fa 100644
--- a/src/main/java/com/samskivert/velocity/SiteResourceManager.java
+++ b/src/main/java/com/samskivert/velocity/SiteResourceManager.java
@@ -5,7 +5,7 @@
 
 package com.samskivert.velocity;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.apache.velocity.exception.ParseErrorException;
 import org.apache.velocity.exception.ResourceNotFoundException;