diff --git a/lang/python39/Makefile.version b/lang/python39/Makefile.version
index ff1b8d38c57f..63cfa1c546b9 100644
--- a/lang/python39/Makefile.version
+++ b/lang/python39/Makefile.version
@@ -4,4 +4,4 @@
 # 1. Update python documentation (lang/python-doc-*)
 #    Run "make -C lang/python-doc-html makesum"
 # 2. Remove PORTREVISION in Makefile
-PYTHON_DISTVERSION=	3.9.15
+PYTHON_DISTVERSION=	3.9.16
diff --git a/lang/python39/distinfo b/lang/python39/distinfo
index 188c292bfc5f..56135b6fa1fa 100644
--- a/lang/python39/distinfo
+++ b/lang/python39/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1665570791
-SHA256 (python/Python-3.9.15.tar.xz) = 12daff6809528d9f6154216950423c9e30f0e47336cb57c6aa0b4387dd5eb4b2
-SIZE (python/Python-3.9.15.tar.xz) = 19712208
+TIMESTAMP = 1671061783
+SHA256 (python/Python-3.9.16.tar.xz) = 22dddc099246dd2760665561e8adb7394ea0cc43a72684c6480f9380f7786439
+SIZE (python/Python-3.9.16.tar.xz) = 19738796
diff --git a/lang/python39/files/patch-Modules__socketmodule.c b/lang/python39/files/patch-Modules__socketmodule.c
new file mode 100644
index 000000000000..93ef3b785ab9
--- /dev/null
+++ b/lang/python39/files/patch-Modules__socketmodule.c
@@ -0,0 +1,29 @@
+--- Modules/socketmodule.c
++++ Modules/socketmodule.c
+@@ -1850,6 +1850,11 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
+         /* RDS sockets use sockaddr_in: fall-through */
+ #endif /* AF_RDS */
+ 
++#ifdef AF_DIVERT
++    case AF_DIVERT:
++        /* FreeBSD divert(4) sockets use sockaddr_in: fall-through */
++#endif /* AF_DIVERT */
++
+     case AF_INET:
+     {
+         struct maybe_idna host = {NULL, NULL};
+@@ -7628,6 +7633,14 @@ PyInit__socket(void)
+     PyModule_AddIntMacro(m, AF_SYSTEM);
+ #endif
+ 
++/* FreeBSD divert(4) */
++#ifdef PF_DIVERT
++    PyModule_AddIntMacro(m, PF_DIVERT);
++#endif
++#ifdef AF_DIVERT
++    PyModule_AddIntMacro(m, AF_DIVERT);
++#endif
++
+ #ifdef AF_PACKET
+     PyModule_AddIntMacro(m, AF_PACKET);
+ #endif