diff --git a/postgresql-testsuite-keep-results-file.patch b/postgresql-testsuite-keep-results-file.patch
index 0cfcec3..059241e 100644
--- a/postgresql-testsuite-keep-results-file.patch
+++ b/postgresql-testsuite-keep-results-file.patch
@@ -4,11 +4,9 @@ Date:   Mon Mar 11 18:42:39 2013 +0100
 
     don't unlink the result file
 
-Index: postgresql-12beta2/src/test/regress/pg_regress.c
-===================================================================
---- postgresql-12beta2.orig/src/test/regress/pg_regress.c
-+++ postgresql-12beta2/src/test/regress/pg_regress.c
-@@ -2597,7 +2597,6 @@ regression_main(int argc, char *argv[],
+--- src/test/regress/pg_regress.c.orig
++++ src/test/regress/pg_regress.c
+@@ -2668,7 +2668,6 @@ regression_main(int argc, char *argv[],
  	else
  	{
  		unlink(difffilename);
diff --git a/postgresql13.changes b/postgresql13.changes
index 06afefc..cc03a4b 100644
--- a/postgresql13.changes
+++ b/postgresql13.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Tue Oct 10 12:49:02 UTC 2023 - Reinhard Max <max@suse.com>
+
+- boo#1216022: Call install-alternatives from the devel subpackage
+  as well, otherwise the symlink for ecpg might be missing.
+
+-------------------------------------------------------------------
+Mon Sep 18 15:24:14 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Also buildignore the postgresql*-implementation symbols: this is
+  needed in order to bootstrap when no postgresql version currently
+  has valid symbols provided. Once the packages are built, OBS
+  could translate this to the pgname-* packages and accept the
+  ignores; during bootstrap though, there is nothing providing the
+  symbol and the existing buildignores do not suffice.
+
 -------------------------------------------------------------------
 Wed Aug  9 09:55:59 UTC 2023 - Reinhard Max <max@suse.com>
 
diff --git a/postgresql13.spec b/postgresql13.spec
index cf480ec..d9e175b 100644
--- a/postgresql13.spec
+++ b/postgresql13.spec
@@ -159,6 +159,10 @@ BuildRequires:  pkgconfig(systemd)
 #!BuildIgnore:  %pgname-pltcl
 #!BuildIgnore:  %pgname-plperl
 #!BuildIgnore:  %pgname-plpython
+#!BuildIgnore:  postgresql-implementation
+#!BuildIgnore:  postgresql-server-implementation
+#!BuildIgnore:  postgresql-server-devel-implementation
+#!BuildIgnore:  postgresql-llvmjit-devel-implementation
 Summary:        Basic Clients and Utilities for PostgreSQL
 License:        PostgreSQL
 Group:          Productivity/Databases/Tools
@@ -505,7 +509,7 @@ included in the postgresql-server package.
 touch -r configure tmp
 %patch1
 %patch4
-%patch8 -p1
+%patch8
 %patch9
 %if %{with llvm}
 %patch10
@@ -791,18 +795,20 @@ awk -v P=%buildroot '/^(%lang|[^%])/{print P $NF}' libpq.files libecpg.files | x
 
 %post -n %pgname-%devel
 /sbin/ldconfig
-%if %{with server_devel}
-%post server-devel
-%endif
 /usr/share/postgresql/install-alternatives %pgmajor
 
 %postun -n %pgname-%devel
 /sbin/ldconfig
-%if %{with server_devel}
-%postun server-devel
-%endif
 /usr/share/postgresql/install-alternatives %pgmajor
 
+%if %{with server_devel}
+%post server-devel
+/usr/share/postgresql/install-alternatives %pgmajor
+
+%postun server-devel
+/usr/share/postgresql/install-alternatives %pgmajor
+%endif
+
 %if !%mini
 
 %postun