diff --git a/ChangeLog b/ChangeLog
index 94460e16..3e9e6b6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,8 +10,8 @@ iRedMail-1.7.5:
 * Updated packages:
     + Roundcube 1.6.12 (addresses 2 security issues)
     + netdata 2.8.4
-    + iRedAPD 6.0, supports secure (ssl) sql connection.
-    + mlmmjadmin 3.6.0, supports secure (ssl) sql connection.
+    + iRedAPD 6.1, supports secure (ssl) sql connection.
+    + mlmmjadmin 3.6.1, supports secure (ssl) sql connection.
     + iRedAdmin 2.7
 
 iRedMail-1.7.4:
diff --git a/conf/amavisd b/conf/amavisd
index 90c0a568..edbf69b7 100644
--- a/conf/amavisd
+++ b/conf/amavisd
@@ -55,7 +55,13 @@ if [ X"${DISTRO}" == X'RHEL' ]; then
     export AMAVISD_CONF='/etc/amavisd/amavisd.conf'
 
 elif [ X"${DISTRO}" == X'DEBIAN' -o X"${DISTRO}" == X'UBUNTU' ]; then
+    # Debian 12 (bookworm), 13 (trixie)
+    # Ubuntu 24.04 (noble)
     export AMAVISD_BIN='/usr/sbin/amavisd'
+
+    # Ubuntu 22.04 (jammy)
+    [[ X"${DISTRO_CODENAME}" == X"jammy" ]] && export AMAVISD_BIN='/usr/sbin/amavisd-new'
+
     export AMAVISD_CONF_DIR='/etc/amavis/conf.d'
     export AMAVISD_CONF='/etc/amavis/conf.d/50-user'
     export AMAVISD_RC_SCRIPT_NAME='amavis'
diff --git a/conf/iredapd b/conf/iredapd
index f87cdc96..79ebc212 100644
--- a/conf/iredapd
+++ b/conf/iredapd
@@ -20,7 +20,7 @@
 # along with iRedMail.  If not, see <http://www.gnu.org/licenses/>.
 #---------------------------------------------------------------------
 
-export IREDAPD_VERSION='6.0'
+export IREDAPD_VERSION='6.1'
 export SYS_USER_IREDAPD='iredapd'
 export SYS_GROUP_IREDAPD='iredapd'
 
diff --git a/conf/mlmmj b/conf/mlmmj
index f0514dcb..f31a8cef 100644
--- a/conf/mlmmj
+++ b/conf/mlmmj
@@ -54,7 +54,7 @@ export MLMMJADMIN_RC_SCRIPT_PATH="${DIR_RC_SCRIPTS}/${MLMMJADMIN_RC_SCRIPT_NAME}
 export MLMMJADMIN_LISTEN_PORT='7790'
 export MLMMJADMIN_PID_FILE='/var/run/mlmmjadmin/mlmmjadmin.pid'
 
-export MLMMJADMIN_VERSION='3.6.0'
+export MLMMJADMIN_VERSION='3.6.1'
 export MLMMJADMIN_TARBALL="mlmmjadmin-${MLMMJADMIN_VERSION}.tar.gz"
 
 export MLMMJADMIN_PARENT_DIR='/opt'
diff --git a/pkgs/pkgs.freebsd.sha256 b/pkgs/pkgs.freebsd.sha256
index a4186772..391b0d93 100644
--- a/pkgs/pkgs.freebsd.sha256
+++ b/pkgs/pkgs.freebsd.sha256
@@ -1,3 +1,3 @@
 SHA256 (misc/iRedAdmin-2.7.tar.gz) = 7881ee9ae65f9fef017c5ffbbcf6cfe730d5740e6c0274a18872c7dafa6883b3
-SHA256 (misc/mlmmjadmin-3.6.0.tar.gz) = a102938a0413f43935a792e16cf439b02a5897e9b7db1dbfc9f85233572d0f2a
-SHA256 (misc/iRedAPD-6.0.tar.gz) = e421d8eb373331503e6a62b4356289635779385bbe7130c64671c6072ba7b4ff
+SHA256 (misc/mlmmjadmin-3.6.1.tar.gz) = 83868f22231ed9467beb2b96447f73544286a3d2717d2647caa0e06c2fccc2d4
+SHA256 (misc/iRedAPD-6.1.tar.gz) = 2045c0ddb6a0be28f72390f1baed6a16c81c80c2ad4376cbdb93e15e6ae0b91b
diff --git a/pkgs/pkgs.openbsd.sha256 b/pkgs/pkgs.openbsd.sha256
index a6b49050..4a15c981 100644
--- a/pkgs/pkgs.openbsd.sha256
+++ b/pkgs/pkgs.openbsd.sha256
@@ -1,6 +1,6 @@
 SHA256 (misc/uwsgi-2.0.28.tar.gz) = 4bb0762c5becb0414352cca664957206df4d6847e9a1c472e87708dc2cdad610
 SHA256 (misc/iRedAdmin-2.7.tar.gz) = 7881ee9ae65f9fef017c5ffbbcf6cfe730d5740e6c0274a18872c7dafa6883b3
-SHA256 (misc/mlmmjadmin-3.6.0.tar.gz) = a102938a0413f43935a792e16cf439b02a5897e9b7db1dbfc9f85233572d0f2a
-SHA256 (misc/iRedAPD-6.0.tar.gz) = e421d8eb373331503e6a62b4356289635779385bbe7130c64671c6072ba7b4ff
+SHA256 (misc/mlmmjadmin-3.6.1.tar.gz) = 83868f22231ed9467beb2b96447f73544286a3d2717d2647caa0e06c2fccc2d4
+SHA256 (misc/iRedAPD-6.1.tar.gz) = 2045c0ddb6a0be28f72390f1baed6a16c81c80c2ad4376cbdb93e15e6ae0b91b
 SHA256 (misc/roundcubemail-1.6.12-complete.tar.gz) = 180b485dfde1898b2f1ac8046b34063898d263d7605fc64c41e230e3418f2a30
 SHA256 (misc/fail2ban-1.1.0.tar.gz) = 474fcc25afdaf929c74329d1e4d24420caabeea1ef2e041a267ce19269570bae
diff --git a/pkgs/pkgs.sha256 b/pkgs/pkgs.sha256
index d9feb040..84d244f9 100644
--- a/pkgs/pkgs.sha256
+++ b/pkgs/pkgs.sha256
@@ -1,5 +1,5 @@
 7881ee9ae65f9fef017c5ffbbcf6cfe730d5740e6c0274a18872c7dafa6883b3  misc/iRedAdmin-2.7.tar.gz
-a102938a0413f43935a792e16cf439b02a5897e9b7db1dbfc9f85233572d0f2a  misc/mlmmjadmin-3.6.0.tar.gz
-e421d8eb373331503e6a62b4356289635779385bbe7130c64671c6072ba7b4ff  misc/iRedAPD-6.0.tar.gz
+83868f22231ed9467beb2b96447f73544286a3d2717d2647caa0e06c2fccc2d4  misc/mlmmjadmin-3.6.1.tar.gz
+2045c0ddb6a0be28f72390f1baed6a16c81c80c2ad4376cbdb93e15e6ae0b91b  misc/iRedAPD-6.1.tar.gz
 e50e860080249747351769067942c86c3c482a9d1a53151b473a88379bef3ceb  misc/netdata-v2.8.4.gz.run
 180b485dfde1898b2f1ac8046b34063898d263d7605fc64c41e230e3418f2a30  misc/roundcubemail-1.6.12-complete.tar.gz