diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index 4505bbce4..978f96f41 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -11,11 +11,11 @@
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
 # latest commit on stable branch
-_commit='743b771c559c6101544f7358a42c8c519fe4b0db'
+_commit='a1b2c92d8290c76a29ccd0887a92ac064e1bb5a1'
 # Bump this to latest major release for signed tag verification,
 # the commit count is handled by pkgver() function.
-pkgver=235.38
-pkgrel=4
+pkgver=236.0
+pkgrel=2
 arch=('x86_64')
 url="https://www.github.com/systemd/systemd"
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
@@ -53,10 +53,8 @@ sha512sums=('SKIP'
             '10190fba9f39a8f4b620a0829e0ba8ed63bb4dbeca712966011ee7807880d01ab2abff1a80baafeb6674db70526a473fe585db8190e864f318fc4d6068552618')
 
 _backports=(
-	# Fix typo in statx macro (#7180) (FS#56289)
-	'8e6a7a8b2be409d356bcaface00f6d44390c07ff'
-	# seccomp: include ARM set_tls in @default
-	'ce5faeac1f79f3afefcc129025a1cec0211313fb'
+  # cryptsetup-generator: Don't mistake NULL input as OOM (#7688) 
+  'aff0b1fa7bf2ca60fd5ffdf7ea25184d576cf61d'
 )
 
 _reverts=(