diff --git a/tcl-aa4a13c15516da45.patch b/tcl-aa4a13c15516da45.patch
deleted file mode 100644
index a440310..0000000
--- a/tcl-aa4a13c15516da45.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: unix/Makefile.in
-==================================================================
---- unix/Makefile.in
-+++ unix/Makefile.in
-@@ -1783,17 +1783,17 @@
- # Stub library binaries, these must be compiled for use in a shared library
- # even though they will be placed in a static archive
- #--------------------------------------------------------------------------
- 
- tclStubLib.o: $(GENERIC_DIR)/tclStubLib.c
--	$(CC) -c $(STUB_CC_SWITCHES) -DSTATIC_BUILD $(GENERIC_DIR)/tclStubLib.c
-+	$(CC) -c $(STUB_CC_SWITCHES) -DSTATIC_BUILD -fno-lto $(GENERIC_DIR)/tclStubLib.c
- 
- tclTomMathStubLib.o: $(GENERIC_DIR)/tclTomMathStubLib.c
--	$(CC) -c $(STUB_CC_SWITCHES) $(GENERIC_DIR)/tclTomMathStubLib.c
-+	$(CC) -c $(STUB_CC_SWITCHES) -DSTATIC_BUILD -fno-lto $(GENERIC_DIR)/tclTomMathStubLib.c
- 
- tclOOStubLib.o: $(GENERIC_DIR)/tclOOStubLib.c
--	$(CC) -c $(STUB_CC_SWITCHES) $(GENERIC_DIR)/tclOOStubLib.c
-+	$(CC) -c $(STUB_CC_SWITCHES) -DSTATIC_BUILD -fno-lto $(GENERIC_DIR)/tclOOStubLib.c
- 
- .c.o:
- 	$(CC) -c $(CC_SWITCHES) $<
- 
- #--------------------------------------------------------------------------
-
diff --git a/tcl-rpmlintrc b/tcl-rpmlintrc
index caf740e..72d35ad 100644
--- a/tcl-rpmlintrc
+++ b/tcl-rpmlintrc
@@ -1,2 +1,3 @@
 addFilter("no-soname")
 addFilter("files-duplicate")
+addFilter("bin-sh-syntax-error")
diff --git a/tcl.changes b/tcl.changes
index e284b78..3ebb02a 100644
--- a/tcl.changes
+++ b/tcl.changes
@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Tue Nov  9 17:08:21 UTC 2021 - Reinhard Max <max@suse.com>
+
+- New version 8.6.12:
+  * (bug)[d43f96] [string trim*] broken for Emoji
+  * (bug)[22324b] [string reverse] broken for Emoji
+  * (bug)[1dab71,7c64aa] BRE broken by uninitialized value use
+  * (bug)[8419c5] Unix tty channels tolerate EINTR
+        *** POTENTIAL INCOMPATIBILITY ***
+  * (bug)[4c591f] [string compare] EIAS violation
+  * (bug)[266494] [concat foo [list #]] EIAS violation
+  * (bug)[24b918] Save IO buffers from modern optimizers
+  * (new) support for POSIX error EILSEQ
+  * (bug)[688fcc] segfault during traced delete of alias
+  * (bug)[ccc448] segfault in ensemble rewrite machinery
+  * (new) Update to Unicode-14
+  * (bug)[a8579d] failed proc argument spec processing
+  * Obsoletes tcl-aa4a13c15516da45.patch
+- Bump %itclver and ensure it stays in sync.
+
 -------------------------------------------------------------------
 Wed May  5 18:32:38 UTC 2021 - Reinhard Max <max@suse.com>
 
diff --git a/tcl.spec b/tcl.spec
index 8a950b7..1d30949 100644
--- a/tcl.spec
+++ b/tcl.spec
@@ -18,11 +18,11 @@
 
 Name:           tcl
 URL:            http://www.tcl.tk
-Version:        8.6.11
+Version:        8.6.12
 Release:        0
 %define         rrc %{nil}
 %define TCL_MINOR %(echo %version | cut -c1-3)
-%define itclver 4.2.0
+%define itclver 4.2.2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        The Tcl Programming Language
 License:        TCL
@@ -41,7 +41,6 @@ Source0:        http://prdownloads.sourceforge.net/tcl/%{name}%{version}%{rrc}-s
 Source1:        tcl-rpmlintrc
 Source2:        baselibs.conf
 Source3:        macros.tcl
-Patch0:         tcl-aa4a13c15516da45.patch
 BuildRequires:  autoconf
 BuildRequires:  pkg-config
 BuildRequires:  zlib-devel
@@ -81,7 +80,10 @@ the Tcl language itself.
 
 %prep
 %setup -q -n %name%version
-%patch0
+if ! test -d pkgs/itcl%itclver; then
+   : Version mismatch in itcl, please chek the %%itclver macro!
+   exit 1
+fi
 
 %build
 %global _lto_cflags %{_lto_cflags} -ffat-lto-objects
@@ -154,6 +156,8 @@ ln -sf tclsh%TCL_MINOR %buildroot%_prefix/bin/tclsh
 ln -sf tclsh.1.gz %buildroot%_mandir/man1/tclsh%TCL_MINOR.1.gz
 mkdir -p %buildroot%_datadir/tcl
 install -D %{S:3} -m 644 %buildroot%_rpmmacrodir/macros.tcl
+# We are Tcl, not SQLite
+rm -f %buildroot%bindir/sqlite*
 
 %if "%_lib" == "lib64"
 %post
diff --git a/tcl8.6.11-src.tar.gz b/tcl8.6.11-src.tar.gz
deleted file mode 100644
index 7545539..0000000
--- a/tcl8.6.11-src.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8c0486668586672c5693d7d95817cb05a18c5ecca2f40e2836b9578064088258
-size 10259009
diff --git a/tcl8.6.12-src.tar.gz b/tcl8.6.12-src.tar.gz
new file mode 100644
index 0000000..1bbde79
--- /dev/null
+++ b/tcl8.6.12-src.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:26c995dd0f167e48b11961d891ee555f680c175f7173ff8cb829f4ebcde4c1a6
+size 10353486