diff --git a/debian.control b/debian.control
index d1d4071..31c4eca 100644
--- a/debian.control
+++ b/debian.control
@@ -10,9 +10,8 @@ Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends},
  php-cli, php-fpm, php-mysql, php-simplexml, php-soap,
- system-user-gromox, w3m, libhx32 (>= 4.0)
-Conflicts: php7.4-opcache, php8.0-opcache, php8.1-opcache, php8.2-opcache
-Provides: php7-mapi-gromox
+ system-user-gromox, w3m, libhx32 (>= 4.12)
+Provides: php-mapi-gromox
 Description: Groupware server (backend) with RPCH, IMAP and Z-MAPI support
  .
  Gromox is the central groupware server component of grommunio. It is
diff --git a/debian.gromox.postinst b/debian.gromox.postinst
index d07df6c..22b0ffa 100644
--- a/debian.gromox.postinst
+++ b/debian.gromox.postinst
@@ -38,7 +38,7 @@ else
 fi
 if test -x /usr/bin/systemctl; then
 	systemctl daemon-reload || :
-	systemctl try-restart gromox-adaptor.service gromox-delivery.service \
+	systemctl try-restart gromox-delivery.service \
 		gromox-delivery-queue.service gromox-event.service \
 		gromox-http.service gromox-imap.service gromox-midb.service \
 		gromox-pop3.service gromox-timer.service gromox-zcore.service \
diff --git a/gromox-2.4.tar.asc b/gromox-2.4.tar.asc
deleted file mode 100644
index 888a01f..0000000
--- a/gromox-2.4.tar.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iHUEABYKAB0WIQS8oMXDCcrFaedKkhz3bv5dDCI6jwUCY/tXFgAKCRD3bv5dDCI6
-j6XZAQDge7XM7ikvx3S0eGVzEM5+9RZ0oFUx8E4v9SpE9NMtcQD+MEE7NdlAlsx3
-rilXHRNxZqskfGyY1vYU5sMutzyyZA4=
-=yj02
------END PGP SIGNATURE-----
diff --git a/gromox-2.4.tar.zst b/gromox-2.4.tar.zst
deleted file mode 100644
index 817a1a9..0000000
--- a/gromox-2.4.tar.zst
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:da9a0f0222dcec22880b3dfd13622a0e289c1350f64add4daa2e9bb79089023a
-size 2010993
diff --git a/gromox-2.5.tar.asc b/gromox-2.5.tar.asc
new file mode 100644
index 0000000..ee6cad7
--- /dev/null
+++ b/gromox-2.5.tar.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+
+iHUEABYKAB0WIQS8oMXDCcrFaedKkhz3bv5dDCI6jwUCZAUpXwAKCRD3bv5dDCI6
+jzalAQCdA+IPHbuvf0BA8oFH85p4msl3BcnAfnGPNi7kusdLpgEA+eSkTplA1tEu
+B9mG9fUHGSpL9/NPPlQePkyVg8OT+QE=
+=W3dP
+-----END PGP SIGNATURE-----
diff --git a/gromox-2.5.tar.zst b/gromox-2.5.tar.zst
new file mode 100644
index 0000000..3dd7243
--- /dev/null
+++ b/gromox-2.5.tar.zst
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:727403ab5c797acd1988bc2b39217b6d352248e42e21261de04cf32d63c57b64
+size 2004450
diff --git a/gromox.changes b/gromox.changes
index 45ab868..f96dab1 100644
--- a/gromox.changes
+++ b/gromox.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sun Mar  5 23:23:42 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 2.5
+  * authmgr: Alternate username support
+  * Repair a null deref during HTML-to-text conversion
+  * Synchronization of embedded messages now works
+  * Saving a draft in grommunio-web would erroneously strip the
+    subject prefix
+  * EWS: Detailed FreeBusy requests did not return detailed info
+
 -------------------------------------------------------------------
 Sun Feb 26 18:24:47 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/gromox.spec b/gromox.spec
index ed687b0..6e56cf5 100644
--- a/gromox.spec
+++ b/gromox.spec
@@ -19,7 +19,7 @@
 %define _libexecdir %_prefix/libexec
 
 Name:           gromox
-Version:        2.4
+Version:        2.5
 Release:        0
 Summary:        Groupware server backend with RPC, IMAP,POP3, PHP-MAPI support
 License:        AGPL-3.0-or-later AND GPL-2.0-only AND GPL-3.0-or-later
@@ -50,14 +50,14 @@ BuildRequires:  libvmime-devel >= 0.9.2.175
 BuildRequires:  zstd
 BuildRequires:  group(gromox)
 BuildRequires:  pkgconfig(fmt) >= 8
-BuildRequires:  pkgconfig(gumbo)
 BuildRequires:  pkgconfig(jsoncpp) >= 1.4.0
-BuildRequires:  pkgconfig(libHX) >= 4.9
+BuildRequires:  pkgconfig(libHX) >= 4.12
 BuildRequires:  pkgconfig(libcrypto)
 BuildRequires:  pkgconfig(libcurl)
 BuildRequires:  pkgconfig(libolecf)
 BuildRequires:  pkgconfig(libpff)
 BuildRequires:  pkgconfig(libssl)
+BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(libzstd)
 BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(tinyxml2) >= 8
@@ -75,7 +75,6 @@ Requires:       php8-fpm
 Requires:       php8-mysql
 Requires:       php8-posix
 Requires:       php8-soap
-Conflicts:      php8-opcache
 %endif
 %if 0%{?sle_version} && 0%{?sle_version} < 150400
 Requires:       php-cli
@@ -83,7 +82,6 @@ Requires:       php7-fpm
 Requires:       php7-mysql
 Requires:       php7-posix
 Requires:       php7-soap
-Conflicts:      php7-opcache
 %endif
 %if 0%{?rhel} || 0%{?fedora_version}
 Requires:       php-cli
@@ -91,12 +89,12 @@ Requires:       php-fpm
 Requires:       php-mysqlnd
 Requires:       php-posix
 Requires:       php-soap
-Conflicts:      php-opcache
 %endif
 Requires:       w3m
 Requires(pre):  user(grommunio)
 Requires(pre):  user(gromox)
 Requires(pre):  group(gromox)
+Provides:       php-mapi-gromox = %version-%release
 Provides:       bundled(tzcode) = 2022c
 %{?systemd_ordering}
 %if !0%{?_pamdir:1}
@@ -163,7 +161,7 @@ cp -a "$b/usr/share/gromox/fpm-gromox.conf.sample" "$b/etc/php-fpm.d/gromox.conf
 perl -i -lpe 's{Type=simple}{Type=simple\nRestart=on-failure}' "$b/%_unitdir"/*.service
 %fdupes %buildroot/%_prefix
 
-%global services gromox-delivery.service gromox-delivery-queue.service gromox-event.service gromox-http.service gromox-imap.service gromox-midb.service gromox-pop3.service gromox-timer.service gromox-zcore.service
+%global services gromox-delivery.service gromox-delivery-queue.service gromox-event.service gromox-http.service gromox-imap.service gromox-midb.service gromox-pop3.service gromox-snapshot.service gromox-snapshot.timer gromox-timer.service gromox-zcore.service
 
 %pre
 # User addition done a priori by system-user-gromox(!)