diff --git a/_constraints b/_constraints
new file mode 100644
index 0000000..f2c2682
--- /dev/null
+++ b/_constraints
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<constraints>
+  <overwrite>
+   <conditions>
+     <arch>s390x</arch>
+   </conditions>
+    <hardware>
+     <memory>
+       <size unit="G">12</size>
+     </memory>
+   </hardware>
+  </overwrite>
+</constraints>
diff --git a/postgresql-13.5.tar.bz2 b/postgresql-13.5.tar.bz2
deleted file mode 100644
index c86f073..0000000
--- a/postgresql-13.5.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3
-size 21186674
diff --git a/postgresql-13.5.tar.bz2.sha256 b/postgresql-13.5.tar.bz2.sha256
deleted file mode 100644
index e36e571..0000000
--- a/postgresql-13.5.tar.bz2.sha256
+++ /dev/null
@@ -1 +0,0 @@
-9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3  postgresql-13.5.tar.bz2
diff --git a/postgresql-13.6.tar.bz2 b/postgresql-13.6.tar.bz2
new file mode 100644
index 0000000..289ee01
--- /dev/null
+++ b/postgresql-13.6.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bafc7fa3d9d4da8fe71b84c63ba8bdfe8092935c30c0aa85c24b2c08508f67fc
+size 21257213
diff --git a/postgresql-13.6.tar.bz2.sha256 b/postgresql-13.6.tar.bz2.sha256
new file mode 100644
index 0000000..88e377d
--- /dev/null
+++ b/postgresql-13.6.tar.bz2.sha256
@@ -0,0 +1 @@
+bafc7fa3d9d4da8fe71b84c63ba8bdfe8092935c30c0aa85c24b2c08508f67fc  postgresql-13.6.tar.bz2
diff --git a/postgresql13.changes b/postgresql13.changes
index 572a816..d8ce813 100644
--- a/postgresql13.changes
+++ b/postgresql13.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Wed Apr 13 12:17:48 UTC 2022 - Reinhard Max <max@suse.com>
+
+- bsc#1198166: Pin to llvm13 until the next patchlevel update.
+
+-------------------------------------------------------------------
+Tue Feb  8 14:23:38 UTC 2022 - Reinhard Max <max@suse.com>
+
+- bsc#1195680: Upgrade to 13.6:
+  * https://www.postgresql.org/docs/13/release-13-6.html
+  * Reindexing might be needed after applying this upgrade, so
+    please read the release notes carefully.
+- boo#1190740: Add constraints file with 12GB of memory for s390x
+  as a workaround
+
 -------------------------------------------------------------------
 Thu Nov 25 11:02:15 UTC 2021 - Reinhard Max <max@suse.com>
 
diff --git a/postgresql13.spec b/postgresql13.spec
index c5c3df4..1de29a9 100644
--- a/postgresql13.spec
+++ b/postgresql13.spec
@@ -1,7 +1,7 @@
 #
 # spec file
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,7 @@
 #
 
 
-%define pgversion 13.5
+%define pgversion 13.6
 %define pgmajor 13
 %define pgsuffix %pgmajor
 %define buildlibs 0
@@ -114,9 +114,9 @@ BuildRequires:  libicu-devel
 BuildRequires:  libselinux-devel
 %endif
 %if %{with llvm}
-BuildRequires:  clang
+BuildRequires:  clang13
 BuildRequires:  gcc-c++
-BuildRequires:  llvm-devel
+BuildRequires:  llvm13-devel
 %endif
 BuildRequires:  libxslt-devel
 BuildRequires:  openldap2-devel