diff --git a/apache-commons-net-build.xml b/apache-commons-net-build.xml
index da5df70..a91e4d5 100644
--- a/apache-commons-net-build.xml
+++ b/apache-commons-net-build.xml
@@ -10,7 +10,7 @@
   
   <property name="project.groupId" value="commons-net"/>
   <property name="project.artifactId" value="commons-net"/>
-  <property name="project.version" value="3.6"/>
+  <property name="project.version" value="3.9.0"/>
   <property name="project.name" value="Apache Commons Net"/>
   <property name="project.description" value="Apache Commons Net library contains a collection of network utilities and protocol implementations. Supported protocols include: Echo, Finger, FTP, NNTP, NTP, POP3(S), SMTP(S), Telnet, Whois"/>
   <property name="project.url" value="http://commons.apache.org/proper/commons-net/"/>
@@ -19,12 +19,12 @@
   <property name="project.organization.name" value="The Apache Software Foundation"/>
   <property name="project.organization.id" value="org.apache"/>
   
-  <property name="bundle.version" value="${project.version}.0"/>
-
+  <property name="spec.version" value="3.9"/>
+  
   <property name="compiler.source" value="1.8"/>
   <property name="compiler.target" value="${compiler.source}"/>
 
-  <property name="build.finalName" value="${project.artifactId}-3.6"/>
+  <property name="build.finalName" value="${project.artifactId}-${project.version}"/>
   <property name="build.dir" value="target"/>
   <property name="build.outputDir" value="${build.dir}/classes"/>
   <property name="build.srcDir" value="src/main/java"/>
@@ -235,15 +235,15 @@
 		<attribute name="Bundle-Name" value="${project.name}"/>
 		<attribute name="Bundle-SymbolicName" value="org.apache.commons.${project.artifactId}"/>
 		<attribute name="Bundle-Vendor" value="${project.organization.name}"/>
-		<attribute name="Bundle-Version" value="${bundle.version}"/>
-		<attribute name="Export-Package" value="org.apache.commons.net;version=&quot;${project.version}&quot;,org.apache.commons.net.bsd;version=&quot;${project.version}&quot;,org.apache.commons.net.chargen;version=&quot;${project.version}&quot;,org.apache.commons.net.daytime;version=&quot;${project.version}&quot;,org.apache.commons.net.discard;version=&quot;${project.version}&quot;,org.apache.commons.net.echo;version=&quot;${project.version}&quot;,org.apache.commons.net.finger;version=&quot;${project.version}&quot;,org.apache.commons.net.ftp;version=&quot;${project.version}&quot;,org.apache.commons.net.ftp.parser;version=&quot;${project.version}&quot;,org.apache.commons.net.imap;version=&quot;${project.version}&quot;,org.apache.commons.net.io;version=&quot;${project.version}&quot;,org.apache.commons.net.nntp;version=&quot;${project.version}&quot;,org.apache.commons.net.ntp;version=&quot;${project.version}&quot;,org.apache.commons.net.pop3;version=&quot;${project.version}&quot;,org.apache.commons.net.smtp;version=&quot;${project.version}&quot;,org.apache.commons.net.telnet;version=&quot;${project.version}&quot;,org.apache.commons.net.tftp;version=&quot;${project.version}&quot;,org.apache.commons.net.time;version=&quot;${project.version}&quot;,org.apache.commons.net.util;version=&quot;${project.version}&quot;,org.apache.commons.net.whois;version=&quot;${project.version}&quot;"/>
+		<attribute name="Bundle-Version" value="${project.version}"/>
+		<attribute name="Export-Package" value="org.apache.commons.net.bsd;version=&quot;${project.version}&quot;,org.apache.commons.net.chargen;version=&quot;${project.version}&quot;,org.apache.commons.net.daytime;version=&quot;${project.version}&quot;,org.apache.commons.net.discard;version=&quot;${project.version}&quot;,org.apache.commons.net.echo;version=&quot;${project.version}&quot;,org.apache.commons.net.examples.cidr;version=&quot;${project.version}&quot;,org.apache.commons.net.examples.ftp;version=&quot;${project.version}&quot;,org.apache.commons.net.examples.mail;version=&quot;${project.version}&quot;,org.apache.commons.net.examples.nntp;version=&quot;${project.version}&quot;,org.apache.commons.net.examples.ntp;version=&quot;${project.version}&quot;,org.apache.commons.net.examples.telnet;version=&quot;${project.version}&quot;,org.apache.commons.net.examples.unix;version=&quot;${project.version}&quot;,org.apache.commons.net.examples.util;version=&quot;${project.version}&quot;,org.apache.commons.net.examples;version=&quot;${project.version}&quot;,org.apache.commons.net.finger;version=&quot;${project.version}&quot;,org.apache.commons.net.ftp.parser;version=&quot;${project.version}&quot;,org.apache.commons.net.ftp;version=&quot;${project.version}&quot;,org.apache.commons.net.imap;version=&quot;${project.version}&quot;,org.apache.commons.net.io;version=&quot;${project.version}&quot;,org.apache.commons.net.nntp;version=&quot;${project.version}&quot;,org.apache.commons.net.ntp;version=&quot;${project.version}&quot;,org.apache.commons.net.pop3;version=&quot;${project.version}&quot;,org.apache.commons.net.smtp;version=&quot;${project.version}&quot;,org.apache.commons.net.telnet;version=&quot;${project.version}&quot;,org.apache.commons.net.tftp;version=&quot;${project.version}&quot;,org.apache.commons.net.time;version=&quot;${project.version}&quot;,org.apache.commons.net.util;version=&quot;${project.version}&quot;,org.apache.commons.net.whois;version=&quot;${project.version}&quot;,org.apache.commons.net;version=&quot;${project.version}&quot;"/>
 		<attribute name="Implementation-Title" value="${project.name}"/>
 		<attribute name="Implementation-URL" value="${project.url}"/>
 		<attribute name="Implementation-Vendor" value="${project.organization.name}"/>
 		<attribute name="Implementation-Vendor-Id" value="${project.organization.id}"/>
 		<attribute name="Implementation-Version" value="${project.version}"/>
 		<attribute name="Import-Package" value="javax.crypto,javax.crypto.spec,javax.net,javax.net.ssl"/>
-		<attribute name="Include-Resource" value="examples/examples.properties=src/main/resources/examples/examples.properties,META-INF/NOTICE.txt=NOTICE.txt,META-INF/LICENSE.txt=LICENSE.txt"/>
+		<attribute name="Include-Resource" value="org/apache/commons/net/examples/examples.properties=src/main/resources/org/apache/commons/net/examples/examples.properties,META-INF/NOTICE.txt=NOTICE.txt,META-INF/LICENSE.txt=LICENSE.txt"/>
 		<attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/>
 		<attribute name="JavaPackages-GroupId" value="${project.groupId}"/>
 		<attribute name="JavaPackages-Version" value="${project.version}"/>
@@ -251,7 +251,7 @@
 		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${compiler.target}))&quot;"/>
 		<attribute name="Specification-Title" value="${project.name}"/>
 		<attribute name="Specification-Vendor" value="${project.organization.name}"/>
-		<attribute name="Specification-Version" value="${project.version}"/>
+		<attribute name="Specification-Version" value="${spec.version}"/>
       </manifest>
     </jar>
   </target>
diff --git a/apache-commons-net.changes b/apache-commons-net.changes
index a36c2a0..75cd674 100644
--- a/apache-commons-net.changes
+++ b/apache-commons-net.changes
@@ -1,3 +1,108 @@
+-------------------------------------------------------------------
+Mon Dec  5 10:00:10 UTC 2022 - Fridrich Štrba <fridrich.strba@bluewin.ch>
+
+- Upgrade to 3.9.0 (Security fixes)
+  * Changes in 3.9.0
+    + Use yyyy instead of YYYY in SimpleDateFormat #97.
+      Fixes NET-708.
+    + Prevent serialization of the 4 classes that implement
+      Serializable. It is not useful and is unlikely to work
+      properly.
+    + Use Math.min and Math.max method instead of manual
+      calculations. #104.
+    + Add FTP option to toggle use of return host like CURL.
+      Fixes NET-711, bsc#1206018, CVE-2021-37533.
+    + FTPSClient execPROT removes proxy settings #90. Fixes NET-642.
+    + JUnit5 assertThrows SimpleSMTPHeaderTestCase #121.
+    + JUnit5 assertThrows TestTimeInfo #120.
+    + Simplify conditions avoiding extra operations #88.
+    + Remove reflection from SSLSocketUtils.
+    + Process files with spaces in name for OS400 #95.
+      Fixes NET-707.
+    + [FTP] Add FTPClient.mdtmInstant(String).
+    + [FTP] Add MLSxEntryParser.parseGmtInstant(String).
+    + [FTP] Add FTPClient.getControlKeepAliveReplyTimeoutDuration().
+    + [FTP] Add FTPClient.setControlKeepAliveReplyTimeout(Duration).
+    + [FTP] Add FTPClient.getControlKeepAliveTimeoutDuration().
+    + [FTP] Add FTPClient.setControlKeepAliveTimeout(Duration).
+    + [FTP] Add FTPClient.getDataTimeout().
+    + [FTP] Add FTPClient.setDataTimeout(Duration).
+    + [FTP] Add FTPFile.getTimestampInstant().
+  * Changes in 3.8.0
+    + Add and use NetConstants.
+    + Add and use SocketClient.applySocketAttributes().
+    + [FTP] Add FTPClient.hasFeature(FTPCmd).
+    + [FTP] Add FTPClient.mdtmCalendar(String).
+    + [IMAP] Fix concurrent counting of chunks in IMAPExportMbox.
+    + Fix possible if rare NPEs in tests.
+    + Update SocketClient default connect timeout from ∞ to 60
+      seconds #51. Fixes NET-685.
+    + Apply SocketClient timeout after connection but before SSL
+      negotiation. Fixes NET-695.
+    + Minor Improvements #71, #72.
+  * Changes in 3.7.2
+    + Host name is not set on the SSLSocket causing
+      isEndpointCheckingEnabled to fail. Fixes NET-689.
+    + Fix possible socket and input stream leak on socket exception
+      in org.apache.commons.net.ftp.FTPClient._retrieveFile(String,
+      String, OutputStream).
+    + Performance issue when using the FTPClient to retrieve
+      files #65. Fixes NET-690.
+    + Improve Javadoc for IMAPSClient #68. Fixes NET-691.
+  * Changes in 3.7.1
+    + [FTPS] javax.net.ssl.SSLException: Unsupported or unrecognized
+      SSL message, #59. Fixes NET-687.
+  * Changes in 3.7
+    + IMAPClient.APPEND does not always calculate the correct
+      length. Fixes NET-673.
+    + ALLO FTP Command for files >2GB. Fixes NET-646.
+    + IMAPClient could simplify using empty arguments. Fixes
+      NET-615.
+    + IMAP fails to quote/encode mailbox names. Fixes NET-614.
+    + NPE when closing telnet stream. Fixes NET-643.
+    + Add Automatic-Module-Name MANIFEST entry for Java 9
+      compatibility. Fixes NET-648.
+    + SubnetUtils.SubnetInfo.isInRange("0.0.0.0") returns true for
+      CIDR/31, 32. Fixes NET-641.
+    + Telnet subnegotiations hard-limited to 512 bytes - allow
+      override. Fixes NET-638.
+    + MVSFTPEntryParser.preParse - MVS, z/OS - allow for merged
+      Ext/Used fields. Fixes NET-639.
+    + examples should be in org.apache.commons.net subpackage. Fixes
+      NET-636.
+    + Add SIZE command support. Fixes NET-634.
+    + Add POP3ExportMbox example code
+    + Add XOAUTH2 to IMAP and SMTP. Fixes NET-633.
+    + FTPHTTPClient - support for encoding other than UTF-8. Fixes
+      NET-632.
+    + Bug in MVSFTPEntryParser.parseUnixList (FindBugs). Fixes
+      NET-631.
+    + Error when using org.apache.commons.net.ftp.FTPClient
+      setControlKeepAliveTimeout. Fixes NET-584.
+    + SubnetUtils#SubnetUtils - improved comment. Fixes NET-626.
+    + SubnetUtils - improve construction. Fixes NET-625.
+    + SubnetInfo#getCidrSignature - improve functions. Fixes
+      NET-624.
+    + SubnetInfo#toCidrNotation: A wrong format subnet mask is
+      allowed. Fixes NET-624.
+    + SubnetUtils - fixed spelling errors. Fixes NET-623.
+    + SubnetUtils#SubnetInfo - remove unnecessary accessors. Fixes
+      NET-621.
+    + SubnetUtils - improve binary netmask algorithm. Fixes NET-619.
+    + System Information Leak in ftp parser. Fixes NET-613.
+    + VMS ftp LIST parsing results in empty file list. Fixes
+      NET-678.
+    + FTPListParseEngine should support listing via MLSD. Fixes
+      NET-674.
+    + NullPointerException when FTPClient remote verification fails.
+      Fixes NET-663.
+    + 227 Entering Passive Mode. Fixes NET-649.
+    + Next and Previous IP Address in SubnetUtils.SubnetInfo. Fixes
+      NET-660.
+    + MVSFTPEntryParser doesn't support Record Formats of U. Fixes
+      NET-682.
+
+
 -------------------------------------------------------------------
 Fri Mar 18 18:50:33 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/apache-commons-net.spec b/apache-commons-net.spec
index c6332c3..23ddbca 100644
--- a/apache-commons-net.spec
+++ b/apache-commons-net.spec
@@ -20,13 +20,13 @@
 %global short_name   commons-%{base_name}
 %bcond_with tests
 Name:           apache-%{short_name}
-Version:        3.6
+Version:        3.9.0
 Release:        0
 Summary:        Internet protocol suite Java library
 License:        Apache-2.0
 Group:          Development/Libraries/Java
 URL:            http://commons.apache.org/%{base_name}/
-Source0:        http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
+Source0:        https://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
 Source1:        %{name}-build.xml
 BuildRequires:  ant
 BuildRequires:  fdupes
diff --git a/commons-net-3.6-src.tar.gz b/commons-net-3.6-src.tar.gz
deleted file mode 100644
index a75d846..0000000
--- a/commons-net-3.6-src.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b93715bccb078a31bbd1c1191346c4c2d6d4a06117a9b925c40da7d99aad0c58
-size 430879
diff --git a/commons-net-3.9.0-src.tar.gz b/commons-net-3.9.0-src.tar.gz
new file mode 100644
index 0000000..385a8de
--- /dev/null
+++ b/commons-net-3.9.0-src.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7235fb3d5cdc45032edd7b4efcd47a722e184210150b57b77f813aa440a78163
+size 440911