diff --git a/debian.changelog b/debian.changelog
index 28734b9..4ab54f8 100644
--- a/debian.changelog
+++ b/debian.changelog
@@ -1,4 +1,4 @@
-grommunio-web (3.3.0.f7738a0) unstable; urgency=low
+grommunio-web (3.5.1.31715c1e) unstable; urgency=low
 
   * Current release
 
diff --git a/debian.control b/debian.control
index 08539fa..90ff6ca 100644
--- a/debian.control
+++ b/debian.control
@@ -2,7 +2,7 @@ Source: grommunio-web
 Section: non-free
 Priority: optional
 Maintainer: grommunio <dev@grommunio.com>
-Build-Depends: debhelper (>= 8.0.0), openjdk-9-jdk | openjdk-11-jdk
+Build-Depends: debhelper (>= 8.0.0), java-sdk-headless
 Standards-Version: 3.9.4
 
 Package: grommunio-web
@@ -10,8 +10,8 @@ Architecture: all
 Section: web
 Depends: system-user-groweb, ${misc:Depends}, gromox (>= 1.27), php-bcmath,
  php-curl, php-gd, php-iconv, php-json, php-mbstring,
- php-sqlite3, php-sysvshm, php-xml, php-zip, mapi-header-php, ${dist:Depends},
- system-user-grommunio (>= 3)
+ php-sqlite3, php-sysvshm, php-xml, php-zip, mapi-header-php (>= 1.2.3),
+ ${dist:Depends}, system-user-grommunio (>= 3)
 Provides: grommunio-web-plugin-zdeveloper, grommunio-web-plugin-webmanual,
  grommunio-web-plugin-folderwidgets, grommunio-web-plugin-quickitems,
  grommunio-web-plugin-titlecounter, grommunio-web-plugin-desktopnotifications,
diff --git a/debian.grommunio-web.postinst b/debian.grommunio-web.postinst
index cfbc5c4..9e8e198 100644
--- a/debian.grommunio-web.postinst
+++ b/debian.grommunio-web.postinst
@@ -1,9 +1,8 @@
 #!/bin/sh
-chmod 0750 /var/log/grommunio
 mkdir -p /var/lib/grommunio-web/tmp /var/lib/grommunio-web/sqlite-index
 chown -h groweb:groweb /var/lib/grommunio-web
 chmod 0770 /var/lib/grommunio-web /var/lib/grommunio-web/tmp \
-	/var/lib/grommunio-web/sqlite-index /var/lib/grommunio-web/sqlite-session
+	/var/lib/grommunio-web/sqlite-index /var/lib/grommunio-web/session
 # clear translation caches
 runuser -u groweb -- ipcrm -M 0x950412DE 2>/dev/null || :
 # reload nginx and restart fpm as this package ships config snippets
diff --git a/debian.rules b/debian.rules
index b90ebe5..28f99e2 100644
--- a/debian.rules
+++ b/debian.rules
@@ -15,7 +15,6 @@ export DH_VERBOSE=1
 
 # Mark build as supported (license checks)
 override_dh_auto_build:
-	dh_auto_build -- SUPPORTED_BUILD=1
 
 override_dh_auto_clean:
 
@@ -29,7 +28,7 @@ override_dh_auto_install:
 	dpkg-parsechangelog | grep Version | sed -e 's/^Version: //g' > $(INSTDIR)$(WABASE)/version
 	dpkg-parsechangelog -S Version | sha1sum | cut -b 1-8 >$(INSTDIR)$(WABASE)/cachebuster
 
-	cp -av deploy/* $(INSTDIR)$(WABASE)/
+	cp -av client server plugins *.php *.dist $(INSTDIR)$(WABASE)/
 
 	install -vm 644 LICENSE.txt $(INSTDIR)$(WABASE)/LICENSE.txt
 
@@ -67,6 +66,8 @@ override_dh_auto_install:
 		fi; \
 	done
 
+	rm -rf build $(INSTDIR)$(WABASE)/build
+
 override_dh_fixperms:
 	dh_fixperms -Xvar/lib/grommunio-web/tmp
 	dh_fixperms -Xvar/lib/grommunio-web/sqlite-index
diff --git a/grommunio-web-3.3.0.f7738a0.tar.xz b/grommunio-web-3.3.0.f7738a0.tar.xz
deleted file mode 100644
index 36512da..0000000
--- a/grommunio-web-3.3.0.f7738a0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fb80a596e199d246655bbfc638361613bf91c3de90a6f01d8bb334044260f679
-size 22501308
diff --git a/grommunio-web-3.5.1.31715c1e.tar.xz b/grommunio-web-3.5.1.31715c1e.tar.xz
new file mode 100644
index 0000000..6c1b71a
--- /dev/null
+++ b/grommunio-web-3.5.1.31715c1e.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:974df905da6cc35d9986e55662478b5b0276ab902b40d4a8c13af6656d129329
+size 9412292
diff --git a/grommunio-web.changes b/grommunio-web.changes
index 3528b42..db52f57 100644
--- a/grommunio-web.changes
+++ b/grommunio-web.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Nov  3 08:55:03 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 3.5
+  * Modern authentication system using keycloak openID Connect
+    workflow
+  * Style updates
+  * Remove incorrect filtering of PNG ressources
+- Update to snapshot 3.5.1.31715c1e
+  * Duplicate folder autorenaming on deletion now uses
+    parenthesized counters
+
 -------------------------------------------------------------------
 Sat Sep 23 21:30:16 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/grommunio-web.spec b/grommunio-web.spec
index d5d7a23..a7e52cd 100644
--- a/grommunio-web.spec
+++ b/grommunio-web.spec
@@ -21,7 +21,7 @@
 %endif
 
 Name:           grommunio-web
-Version:        3.3.0.f7738a0
+Version:        3.5.1.31715c1e
 Release:        0
 Summary:        Web client for access to grommunio features from the web
 License:        AGPL-3.0-or-later AND GPL-3.0-only AND LGPL-2.1-only AND MIT
@@ -45,6 +45,7 @@ BuildRequires:  php8-gettext
 Requires:       php8-bcmath
 Requires:       php8-ctype
 Requires:       php8-curl
+Requires:       php8-dom
 Requires:       php8-gd
 Requires:       php8-gettext
 Requires:       php8-iconv
@@ -62,6 +63,7 @@ BuildRequires:  php7-json
 Requires:       php7-bcmath
 Requires:       php7-ctype
 Requires:       php7-curl
+Requires:       php7-dom
 Requires:       php7-gd
 Requires:       php7-gettext
 Requires:       php7-iconv
@@ -80,33 +82,18 @@ Requires:       php-bcmath
 Requires:       php-common
 Requires:       php-ctype
 Requires:       php-curl
+Requires:       php-dom
 Requires:       php-gd
 Requires:       php-mbstring
 Requires:       php-sodium
 Requires:       php-sqlite3
 Requires:       php-xml
 %endif
-
 Requires(pre):  user(groweb)
 Requires:       gromox >= 2.11
-BuildRequires:  mapi-header-php
-Requires:       mapi-header-php
-
+Requires:       mapi-header-php >= 1.2.3
 %if 0%{?suse_version}
 BuildRequires:  fdupes
-BuildRequires:  java >= 1.9.0
-BuildRequires:  java-devel >= 1.9.0
-%else
-BuildRequires:  java-11-openjdk-devel
-BuildRequires:  php-cli
-BuildRequires:  php-json
-%endif
-BuildRequires:  php
-BuildRequires:  xz
-%if 0%{?suse_version} >= 1500
-BuildRequires:  libxml2-tools
-%else
-BuildRequires:  libxml2
 %endif
 
 %define langdir %_datadir/%name/server/language
@@ -115,8 +102,7 @@ BuildRequires:  libxml2
 
 %description
 A web client written in PHP that makes use of HTML5, JSON and ExtJS
-to allow users to make full use of the grommunio
-through a web browser.
+to allow users to make full use of grommunio through a web browser.
 
 %prep
 %autosetup -p1
@@ -127,14 +113,11 @@ echo "%version-%release" >version
 echo "%version-%release" | sha1sum | cut -b 1-8 >cachebuster
 
 %build
-%make_build -j1
 
 %install
 b="%buildroot"
-d="$b/%_datadir"
-mkdir -p "$d"
-cp -a deploy "$b/%_datadir/%name"
-
+mkdir -p "$b/%_datadir/%name"
+cp -a * "$b/%_datadir/%name"
 install -vm 644 LICENSE.txt "$b/%_datadir/%name/LICENSE.txt"
 
 # Nginx conf
@@ -155,7 +138,6 @@ rm -v "$b/%_datadir/%name/debug.php.dist"
 mkdir -pv "$b/var/lib/%name/tmp"
 mkdir -pv "$b/var/lib/%name/sqlite-index"
 mkdir -pv "$b/var/lib/%name/session"
-mkdir -pv "$b/var/log/grommunio"
 
 # Signatures template scripts
 mkdir -pv "$b/%_datadir/doc/grommunio-web/scripts"
@@ -169,7 +151,7 @@ for dir in "$b/%_datadir/%name/plugins"/*; do
 		echo "we did not find a config.php"
 	fi
 done
-
+rm -Rf build "$b/%_datadir/%name/build"
 %if 0%{?fdupes:1}
 %fdupes %buildroot/%_prefix
 %endif
@@ -219,7 +201,6 @@ runuser -u groweb -- ipcrm -M 0x950412DE 2>/dev/null || :
 %_datadir/%name/server/manifest.dtd
 %_datadir/%name/version
 %_datadir/%name/cachebuster
-%attr(750,root,root) /var/log/grommunio/
 
 %dir %langdir/
 %lang(af_ZA) %langdir/af_ZA.UTF-8