diff --git a/bcjmail-jdk18on-1.71.pom b/bcjmail-jdk18on-1.71.pom
new file mode 100644
index 0000000..ecf1697
--- /dev/null
+++ b/bcjmail-jdk18on-1.71.pom
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.bouncycastle</groupId>
+  <artifactId>bcjmail-jdk18on</artifactId>
+  <packaging>jar</packaging>
+  <name>Bouncy Castle Jakarta S/MIME API</name>
+  <version>1.71</version>
+  <description>The Bouncy Castle Java S/MIME APIs for handling S/MIME protocols. This jar contains S/MIME APIs for JDK 1.8 and up. The APIs can be used in conjunction with a JCE/JCA provider such as the one provided with the Bouncy Castle Cryptography APIs. The Jakarta Mail API and the Jakarta activation framework will also be needed.</description>
+  <url>https://www.bouncycastle.org/java.html</url>
+  <licenses>
+    <license>
+      <name>Bouncy Castle Licence</name>
+      <url>https://www.bouncycastle.org/licence.html</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <scm>
+    <url>https://github.com/bcgit/bc-java</url>
+  </scm>
+  <issueManagement>
+     <system>GitHub</system>
+     <url>https://github.com/bcgit/bc-java/issues</url>
+  </issueManagement>
+  <developers>
+    <developer>
+      <id>feedback-crypto</id>
+      <name>The Legion of the Bouncy Castle Inc.</name>
+      <email>feedback-crypto@bouncycastle.org</email>
+    </developer>
+  </developers>
+  <dependencies>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcprov-jdk18on</artifactId>
+      <version>1.71</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcutil-jdk18on</artifactId>
+      <version>1.71</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcpkix-jdk18on</artifactId>
+      <version>1.71</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>jakarta.mail</groupId>
+        <artifactId>jakarta.mail-api</artifactId>
+        <version>[2.0,3.0)</version>
+    </dependency>
+    <dependency>
+        <groupId>jakarta.activation</groupId>
+        <artifactId>jakarta.activation-api</artifactId>
+        <version>[2.0,3.0)</version>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/bouncycastle.spec b/bouncycastle.spec
index 1e0c874..71062b9 100644
--- a/bouncycastle.spec
+++ b/bouncycastle.spec
@@ -36,16 +36,17 @@ Source3:        https://repo1.maven.org/maven2/org/%{name}/bcpg-jdk18on/%{versio
 Source4:        https://repo1.maven.org/maven2/org/%{name}/bcmail-jdk18on/%{version}/bcmail-jdk18on-%{version}.pom
 Source5:        https://repo1.maven.org/maven2/org/%{name}/bctls-jdk18on/%{version}/bctls-jdk18on-%{version}.pom
 Source6:        https://repo1.maven.org/maven2/org/%{name}/bcutil-jdk18on/%{version}/bcutil-jdk18on-%{version}.pom
+Source7:        https://repo1.maven.org/maven2/org/%{name}/bcjmail-jdk18on/%{version}/bcjmail-jdk18on-%{version}.pom
 Patch0:         bouncycastle-javadoc.patch
 Patch1:         bouncycastle-osgi.patch
 BuildRequires:  ant
 BuildRequires:  ant-junit
 BuildRequires:  fdupes
 BuildRequires:  glassfish-activation-api
+BuildRequires:  jakarta-activation
+BuildRequires:  jakarta-mail
 BuildRequires:  javamail
 BuildRequires:  javapackages-local
-BuildRequires:  mvn(jakarta.activation:jakarta.activation-api)
-BuildRequires:  mvn(jakarta.mail:jakarta.mail-api)
 Requires(post): javapackages-tools
 Requires(postun):javapackages-tools
 Provides:       bcprov = %{version}-%{release}
@@ -94,6 +95,23 @@ be used in conjunction with a JCE/JCA provider such as the one provided with
 the Bouncy Castle Cryptography APIs. The JavaMail API and the Java activation
 framework will also be needed.
 
+%package jmail
+Summary:        Bouncy Castle Jakarta S/MIME API
+License:        MIT
+Group:          Development/Libraries/Java
+Requires:       %{name} = %{version}
+Requires:       %{name}-pkix = %{version}
+Requires:       %{name}-util = %{version}
+Requires:       jakarta-activation
+Requires:       jakarta-mail
+
+%description jmail
+The Bouncy Castle Java S/MIME APIs for handling S/MIME protocols. This jar
+contains S/MIME APIs for JDK 1.8 and up. The APIs can be used in conjunction
+with a JCE/JCA provider such as the one provided with the Bouncy Castle
+Cryptography APIs. The Jakarta Mail API and the Jakarta activation framework
+will also be needed.
+
 %package tls
 Summary:        Bouncy Castle JSSE provider and TLS/DTLS API
 License:        MIT
@@ -154,7 +172,7 @@ touch %{buildroot}%{_sysconfdir}/java/security/security.d/2000-%{classname}
 
 install -dm 0755 %{buildroot}%{_javadir}
 install -dm 0755 %{buildroot}%{_mavenpomdir}
-for bc in bcprov bcpkix bcpg bcmail bctls bcutil ; do
+for bc in bcprov bcpkix bcpg bcmail bctls bcutil bcjmail ; do
   install -pm 0644 build/artifacts/jdk1.8/jars/$bc-%{archivever}.jar %{buildroot}%{_javadir}/$bc.jar
   install -pm 0644 %{_sourcedir}/$bc-jdk18on-%{version}.pom %{buildroot}%{_mavenpomdir}/$bc.pom
   %add_maven_depmap $bc.pom $bc.jar -a "org.bouncycastle:$bc-jdk18,org.bouncycastle:$bc-jdk16,org.bouncycastle:$bc-jdk15on,org.bouncycastle:$bc-jdk15,org.bouncycastle:$bc-jdk15to18" -f $bc
@@ -226,6 +244,9 @@ fi
 %files mail -f .mfiles-bcmail
 %license build/artifacts/jdk1.8/bcmail-jdk18on-*/LICENSE.html
 
+%files jmail -f .mfiles-bcjmail
+%license build/artifacts/jdk1.8/bcjmail-jdk18on-*/LICENSE.html
+
 %files tls -f .mfiles-bctls
 %license build/artifacts/jdk1.8/bctls-jdk18on-*/LICENSE.html