diff --git a/acme4j-smime/src/main/java/org/shredzone/acme4j/smime/csr/SMIMECSRBuilder.java b/acme4j-smime/src/main/java/org/shredzone/acme4j/smime/csr/SMIMECSRBuilder.java
index 885f8472..5be00bdb 100644
--- a/acme4j-smime/src/main/java/org/shredzone/acme4j/smime/csr/SMIMECSRBuilder.java
+++ b/acme4j-smime/src/main/java/org/shredzone/acme4j/smime/csr/SMIMECSRBuilder.java
@@ -57,7 +57,7 @@ import org.shredzone.acme4j.smime.EmailIdentifier;
  * Requires {@code Bouncy Castle}. The {@link org.bouncycastle.jce.provider.BouncyCastleProvider}
  * must also be added as security provider.
  * <p>
- * A {@code javax.mail} implementation must be present in the classpath.
+ * A {@code jakarta.mail} implementation must be present in the classpath.
  *
  * @since 2.12
  */
diff --git a/acme4j-smime/src/main/java/org/shredzone/acme4j/smime/email/ResponseGenerator.java b/acme4j-smime/src/main/java/org/shredzone/acme4j/smime/email/ResponseGenerator.java
index 73f11f64..fbcb13cf 100644
--- a/acme4j-smime/src/main/java/org/shredzone/acme4j/smime/email/ResponseGenerator.java
+++ b/acme4j-smime/src/main/java/org/shredzone/acme4j/smime/email/ResponseGenerator.java
@@ -129,7 +129,7 @@ public class ResponseGenerator {
      * MTA.
      *
      * @param session
-     *         {@code javax.mail} {@link Session} to be used for this mail.
+     *         {@code jakarta.mail} {@link Session} to be used for this mail.
      * @return Generated {@link Message}.
      */
     public Message generateResponse(Session session) throws MessagingException {
diff --git a/src/doc/docs/challenge/email-reply-00.md b/src/doc/docs/challenge/email-reply-00.md
index accce3d0..e709e162 100644
--- a/src/doc/docs/challenge/email-reply-00.md
+++ b/src/doc/docs/challenge/email-reply-00.md
@@ -57,7 +57,7 @@ It is basically invoked like this:
 Message               challengeMessage = // incoming challenge message from the CA
 EmailReply00Challenge challenge        = // challenge that is requested by the CA
 EmailIdentifier       identifier       = // email address to get the S/MIME cert for
-javax.mail.Session    mailSession      = // javax.mail session
+jakarta.mail.Session  mailSession      = // jakarta.mail session
 
 Message response = EmailProcessor.plainMessage(challengeMessage)
             .expectedIdentifier(identifier)
diff --git a/src/doc/docs/index.md b/src/doc/docs/index.md
index f1fdf6a3..cbf53c16 100644
--- a/src/doc/docs/index.md
+++ b/src/doc/docs/index.md
@@ -49,7 +49,7 @@ acme4j-client
     The Java module name is `org.shredzone.acme4j`.
 
 acme4j-smime
-:   [`acme4j-smime`](https://mvnrepository.com/artifact/org.shredzone.acme4j/acme4j-smime/latest) contains the [RFC 8823](https://tools.ietf.org/html/rfc8823) implementation for ordering S/MIME certificates. It requires [Bouncy Castle](https://www.bouncycastle.org/java.html) and a `javax.mail` implementation.
+:   [`acme4j-smime`](https://mvnrepository.com/artifact/org.shredzone.acme4j/acme4j-smime/latest) contains the [RFC 8823](https://tools.ietf.org/html/rfc8823) implementation for ordering S/MIME certificates. It requires [Bouncy Castle](https://www.bouncycastle.org/java.html) and a `jakarta.mail` implementation.
 
     The Java module name is `org.shredzone.acme4j.smime`.