diff --git a/postgresql-12.5.tar.bz2 b/postgresql-12.5.tar.bz2
deleted file mode 100644
index 72ccfa5..0000000
--- a/postgresql-12.5.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bd0d25341d9578b5473c9506300022de26370879581f5fddd243a886ce79ff95
-size 20729654
diff --git a/postgresql-12.5.tar.bz2.sha256 b/postgresql-12.5.tar.bz2.sha256
deleted file mode 100644
index 24a9f69..0000000
--- a/postgresql-12.5.tar.bz2.sha256
+++ /dev/null
@@ -1 +0,0 @@
-bd0d25341d9578b5473c9506300022de26370879581f5fddd243a886ce79ff95  postgresql-12.5.tar.bz2
diff --git a/postgresql-12.6.tar.bz2 b/postgresql-12.6.tar.bz2
new file mode 100644
index 0000000..20fcdf1
--- /dev/null
+++ b/postgresql-12.6.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:df7dd98d5ccaf1f693c7e1d0d084e9fed7017ee248bba5be0167c42ad2d70a09
+size 20771172
diff --git a/postgresql-12.6.tar.bz2.sha256 b/postgresql-12.6.tar.bz2.sha256
new file mode 100644
index 0000000..f879b18
--- /dev/null
+++ b/postgresql-12.6.tar.bz2.sha256
@@ -0,0 +1 @@
+df7dd98d5ccaf1f693c7e1d0d084e9fed7017ee248bba5be0167c42ad2d70a09  postgresql-12.6.tar.bz2
diff --git a/postgresql-icu68.patch b/postgresql-icu68.patch
deleted file mode 100644
index fc24da2..0000000
--- a/postgresql-icu68.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rupN a/src/backend/commands/collationcmds.c b/src/backend/commands/collationcmds.c
---- a/src/backend/commands/collationcmds.c	2020-11-07 08:03:24.122756440 +0300
-+++ b/src/backend/commands/collationcmds.c	2020-11-07 08:04:18.168901199 +0300
-@@ -464,7 +464,7 @@ get_icu_language_tag(const char *localen
- 	UErrorCode	status;
- 
- 	status = U_ZERO_ERROR;
--	uloc_toLanguageTag(localename, buf, sizeof(buf), TRUE, &status);
-+	uloc_toLanguageTag(localename, buf, sizeof(buf), true, &status);
- 	if (U_FAILURE(status))
- 		ereport(ERROR,
- 				(errmsg("could not convert locale name \"%s\" to language tag: %s",
diff --git a/postgresql12.changes b/postgresql12.changes
index aec5b5a..f76920d 100644
--- a/postgresql12.changes
+++ b/postgresql12.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Fri Feb 19 15:30:08 UTC 2021 - Reinhard Max <max@suse.com>
+
+- boo#1179945: Disable icu for PostgreSQL 10 (and older) on TW.
+
+-------------------------------------------------------------------
+Wed Feb 10 13:32:07 UTC 2021 - Reinhard Max <max@suse.com>
+
+Upgrade to version 12.6:
+  * https://www.postgresql.org/docs/12/release-12-6.html  
+  * Reindexing might be needed after applying this update.
+  * CVE-2021-3393, bsc#1182040: Fix information leakage in
+    constraint-violation error messages.
+  * Obsoletes postgresql-icu68.patch.
+
 -------------------------------------------------------------------
 Mon Dec 14 16:19:33 UTC 2020 - Callum Farmer <gmbr3@opensuse.org>
 
diff --git a/postgresql12.spec b/postgresql12.spec
index e365e20..6cb623e 100644
--- a/postgresql12.spec
+++ b/postgresql12.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package postgresql12
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 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 12.5
+%define pgversion 12.6
 %define pgmajor 12
 %define pgsuffix %pgmajor
 %define buildlibs 0
@@ -72,7 +72,11 @@ BuildRequires:  tcl-devel
 BuildRequires:  timezone
 BuildRequires:  zlib-devel
 %bcond_without  selinux
+%if %pgmajor > 10 || 0%{?suse_version} <= 1500
 %bcond_without  icu
+%else
+%bcond_with icu
+%endif
 %if  !%buildlibs
 BuildRequires:  %libecpg
 BuildRequires:  %libpq
@@ -145,7 +149,6 @@ Patch4:         postgresql-plperl-keep-rpath.patch
 Patch6:         postgresql-testsuite-int8.sql.patch
 Patch8:         postgresql-testsuite-keep-results-file.patch
 Patch9:         postgresql-var-run-socket.patch
-Patch10:        postgresql-icu68.patch
 URL:            https://www.postgresql.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Provides:       postgresql = %version-%release
@@ -453,7 +456,6 @@ touch -r configure tmp
 %patch6
 %patch8 -p1
 %patch9
-%patch10 -p1
 touch -r tmp configure
 rm tmp
 find src/test/ -name '*.orig' -delete