diff --git a/jakarta-mail-build.xml b/jakarta-mail-build.xml
index ba5b427..65e6823 100644
--- a/jakarta-mail-build.xml
+++ b/jakarta-mail-build.xml
@@ -8,12 +8,13 @@
 
   <property name="project.groupId" value="jakarta.mail"/>
   <property name="project.artifactId" value="jakarta.mail-api"/>
-  <property name="project.version" value="2.1.0"/>
-  
+  <property name="project.version" value="2.1.3"/>
+
   <property name="spec.version" value="2.1"/>
   <property name="mail.version" value="${project.version}"/>
 
-  <property name="compiler.source" value="1.8"/>
+  <property name="compiler.release" value="8"/>
+  <property name="compiler.source" value="1.${compiler.release}"/>
   <property name="compiler.target" value="${compiler.source}"/>
 
   <property name="build.finalName" value="${project.artifactId}-${project.version}"/>
@@ -56,14 +57,15 @@
     <copy todir="${build.srcDir}">
       <fileset dir="${build.resourceDir}"/>
     </copy>
-    <javac destdir="${build.outputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="${compiler.target}" 
-           verbose="false" 
-           fork="false" 
+    <javac destdir="${build.outputDir}"
+           nowarn="false"
+           debug="true"
+           optimize="false"
+           deprecation="true"
+           release="${compiler.release}"
+           target="${compiler.target}"
+           verbose="false"
+           fork="false"
            source="${compiler.source}">
       <src>
         <pathelement location="${build.srcDir}"/>
@@ -71,14 +73,15 @@
 	  <exclude name="**/module-info.java"/>
       <classpath refid="build.classpath"/>
     </javac>
-    <javac destdir="${build.outputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="9" 
-           verbose="false" 
-           fork="false" 
+    <javac destdir="${build.outputDir}"
+           nowarn="false"
+           debug="true"
+           optimize="false"
+           deprecation="true"
+           release="9"
+           target="9"
+           verbose="false"
+           fork="false"
            source="9">
       <src>
         <pathelement location="${build.srcDir}"/>
@@ -94,26 +97,26 @@
   <!-- ====================================================================== -->
 
   <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${build.srcDir}" 
-             packagenames="*" 
-             destdir="${reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             verbose="false" 
-             encoding="UTF-8" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="UTF-8" 
-             linksource="false" 
-             breakiterator="false" 
+    <javadoc sourcepath="${build.srcDir}"
+             packagenames="*"
+             destdir="${reporting.outputDirectory}/apidocs"
+             access="protected"
+             verbose="false"
+             encoding="UTF-8"
+             version="true"
+             use="true"
+             author="true"
+             splitindex="false"
+             nodeprecated="false"
+             nodeprecatedlist="false"
+             notree="false"
+             noindex="false"
+             nohelp="false"
+             nonavbar="false"
+             serialwarn="false"
+             charset="UTF-8"
+             linksource="false"
+             breakiterator="false"
              source="${compiler.source}">
       <classpath refid="build.classpath"/>
       <header>&lt;![CDATA[&lt;a href=&quot;https://reload4j.qos.ch&quot;&gt;
@@ -126,10 +129,10 @@
   <!-- ====================================================================== -->
 
   <target name="package" depends="compile" description="Package the application">
-    <jar jarfile="${build.dir}/${build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${build.outputDir}" 
+    <jar jarfile="${build.dir}/${build.finalName}.jar"
+         compress="true"
+         index="false"
+         basedir="${build.outputDir}"
          excludes="**/package.html">
       <manifest>
 		<attribute name="Bundle-Description" value="Jakarta Mail API 2.1 Specification API"/>
@@ -146,7 +149,7 @@
 		<attribute name="Implementation-Title" value="Jakarta Mail API"/>
 		<attribute name="Implementation-Vendor" value="Eclipse Foundation"/>
 		<attribute name="Import-Package" value="jakarta.activation;version=&quot;[2.1,3)&quot;,jakarta.mail.event;version=&quot;[2.1,3)&quot;,jakarta.mail.internet;version=&quot;[2.1,3)&quot;,jakarta.mail.search;version=&quot;[2.1,3)&quot;,jakarta.mail.util;version=&quot;[2.1,3)&quot;,jakarta.mail;version=&quot;[2.1,3)&quot;"/>
-		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.8))&quot;"/>
+		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${compiler.target}))&quot;"/>
 		<attribute name="Specification-Title" value="Jakarta Mail Specification"/>
 		<attribute name="Specification-Vendor" value="Eclipse Foundation"/>
 		<attribute name="Specification-Version" value="${spec.version}"/>
diff --git a/jakarta-mail.changes b/jakarta-mail.changes
index 51b388f..3afbc10 100644
--- a/jakarta-mail.changes
+++ b/jakarta-mail.changes
@@ -1,3 +1,34 @@
+-------------------------------------------------------------------
+Mon Apr 29 17:00:51 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to version 2.1.3
+  * Changes:
+    + #621 - j.m.u.FactoryFinder.factoryFromServiceLoader needs
+      PrivilegedAction
+    + #598 - expected resource not found:
+      /META-INF/javamail.default.address.map
+    + #594 - Implement equals() and hashcode() on
+      jakarta.mail.Header
+    + #630 - Use OSGi service loader mediator
+    + #629: jakarta.mail-api-2.1.0.jar does not work in OSGi
+      environment (hk2servicelocator)
+    + #635: The hk2 service loader is not used everywhere (where
+      necessary)
+    + #660: fix wrong class file version for package-info
+    + #664: Typo in Session.setDebug Javadoc
+    + adds missing javadoc descriptions
+    + updates dependency on Jakarta Activation API jar to version
+      2.1.2 and angus-activation used by tests to 2.0.1
+    + #631: Session.getService does not use proper classloader in
+      OSGI environment
+    + #665: Jakarta Mail erroneously assumes that classes can be
+      loaded from Thread#getContextClassLoader
+    + #694: SharedFileInputStream should comply with spec
+    + #710: Cannot parse messages without a session
+    + updates dependency on Jakarta Activation API jar to version
+      2.1.3 and angus-activation used by tests to 2.0.2
+- Use the new https://github.com/jakartaee/mail-api URL
+
 -------------------------------------------------------------------
 Thu Mar  3 14:16:52 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/jakarta-mail.spec b/jakarta-mail.spec
index 35772ad..ed5cd9e 100644
--- a/jakarta-mail.spec
+++ b/jakarta-mail.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package jakarta-mail
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,21 +16,25 @@
 #
 
 
-%global artifact_name jakarta.mail-api
+%global srcname mail-api
+%global artifact_name jakarta.%{srcname}
+# The automatic requires would be java-headless >= 9, but the
+# binaries are java 8 compatible
+%define __requires_exclude java-headless
 Name:           jakarta-mail
-Version:        2.1.0
+Version:        2.1.3
 Release:        0
 Summary:        Jakarta Mail API
 License:        EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-URL:            https://eclipse-ee4j.github.io/mail/
-Source0:        https://github.com/eclipse-ee4j/mail/archive/%{version}/mail-%{version}.tar.gz
+URL:            https://github.com/jakartaee/mail-api
+Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 Source1:        %{name}-build.xml
 BuildRequires:  ant
 BuildRequires:  fdupes
 BuildRequires:  jakarta-activation
 BuildRequires:  java-devel >= 9
-BuildRequires:  javapackages-local
-Requires:       mvn(jakarta.activation:jakarta.activation-api)
+BuildRequires:  javapackages-local >= 6
+Requires:       java-headless >= 1.8
 BuildArch:      noarch
 
 %description
@@ -46,14 +50,12 @@ Summary:        Javadoc for %{name}
 This package contains javadoc for %{name}.
 
 %prep
-%setup -q -n mail-%{version}
+%setup -q -n %{srcname}-%{version}
 cp %{SOURCE1} api/build.xml
-mkdir -p api/lib
-
-%pom_remove_parent api
 
 %build
 pushd api
+mkdir -p lib
 build-jar-repository -s lib jakarta-activation
 %{ant} package javadoc
 popd
@@ -61,12 +63,12 @@ popd
 %install
 pushd api
 # jars
-mkdir -p %{buildroot}%{_javadir}/%{name}
-cp -a target/%{artifact_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{artifact_name}.jar
+install -d -m 0755 %{buildroot}%{_javadir}/%{name}
+install -p -m 0644 target/%{artifact_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{artifact_name}.jar
 
 #pom
 install -d -m 755 %{buildroot}%{_mavenpomdir}/%{name}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{artifact_name}.pom
+%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{artifact_name}.pom
 %add_maven_depmap %{name}/%{artifact_name}.pom %{name}/%{artifact_name}.jar
 
 # javadoc
diff --git a/mail-2.1.0.tar.gz b/mail-2.1.0.tar.gz
deleted file mode 100644
index e9c9175..0000000
--- a/mail-2.1.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d942efe8af6c52df22a1fc94d6316e216185d02480c0bda8ccd614c847d63a80
-size 1072862
diff --git a/mail-api-2.1.3.tar.gz b/mail-api-2.1.3.tar.gz
new file mode 100644
index 0000000..1542d91
--- /dev/null
+++ b/mail-api-2.1.3.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d5efcd841ee518d07cd2a22c57c1c56396c32b80847dddb0d97fa25eb0e0d30b
+size 1219840