diff --git a/sources b/sources
index d5db1f4..1b8fdd6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tcl-core8.6.10-src.tar.gz) = de31ac8fc5226c831198af88befa05ccb1842dcfd209690e25b907f062033b3ae7a77bc12e85c4210ce85cfd7c598060e03fc81b0e624d422bfe4df655cc9068
+SHA512 (tcl-core8.6.12-src.tar.gz) = 7144a50d19d3855edbda14b538cc94fe26c0dd357b979676c3fe02d599dab61ba777bf14f6aaebb63e238aeff1d0bad25ea7b0ff31b2398468f67fc0a305b9f3
diff --git a/tcl-8.6.10-autopath.patch b/tcl-8.6.12-autopath.patch
similarity index 65%
rename from tcl-8.6.10-autopath.patch
rename to tcl-8.6.12-autopath.patch
index f5ac0ba..4a14dd3 100644
--- a/tcl-8.6.10-autopath.patch
+++ b/tcl-8.6.12-autopath.patch
@@ -1,5 +1,5 @@
 diff --git a/library/auto.tcl b/library/auto.tcl
-index a7a8979..892c2c4 100644
+index 7d23b6e..3c7717b 100644
 --- a/library/auto.tcl
 +++ b/library/auto.tcl
 @@ -81,6 +81,13 @@ proc tcl_findLibrary {basename version patch initScript enVarName varName} {
@@ -17,39 +17,39 @@ index a7a8979..892c2c4 100644
  	# Tcl library as well as allowing loading of libraries added to the
  	# auto_path that is not relative to the core library or binary paths.
 diff --git a/library/init.tcl b/library/init.tcl
-index 5cda0d9..ffeb301 100644
+index edf6bd5..fa37bcc 100644
 --- a/library/init.tcl
 +++ b/library/init.tcl
-@@ -47,16 +47,11 @@ if {![info exists auto_path]} {
- }
+@@ -52,16 +52,11 @@ if {![info exists auto_path]} {
  namespace eval tcl {
-     variable Dir
--    foreach Dir [list $::tcl_library [file dirname $::tcl_library]] {
-+    foreach Dir [list $::tcl_library] {
- 	if {$Dir ni $::auto_path} {
- 	    lappend ::auto_path $Dir
- 	}
-     }
--    set Dir [file join [file dirname [file dirname \
--	    [info nameofexecutable]]] lib]
--    if {$Dir ni $::auto_path} {
--	lappend ::auto_path $Dir
--    }
-     catch {
- 	foreach Dir $::tcl_pkgPath {
+     if {![interp issafe]} {
+ 	variable Dir
+-	foreach Dir [list $::tcl_library [file dirname $::tcl_library]] {
++	foreach Dir [list $::tcl_library] {
  	    if {$Dir ni $::auto_path} {
+ 		lappend ::auto_path $Dir
+ 	    }
+ 	}
+-	set Dir [file join [file dirname [file dirname \
+-		[info nameofexecutable]]] lib]
+-	if {$Dir ni $::auto_path} {
+-	    lappend ::auto_path $Dir
+-	}
+ 	if {[info exists ::tcl_pkgPath]} { catch {
+ 	    foreach Dir $::tcl_pkgPath {
+ 		if {$Dir ni $::auto_path} {
 diff --git a/unix/configure.in b/unix/configure.in
-index 0d3f426..13ce9db 100755
+index c73f368..5c57692 100644
 --- a/unix/configure.in
 +++ b/unix/configure.in
 @@ -866,9 +866,9 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
      test -z "$TCL_MODULE_PATH"  && \
  	TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl"
  elif test "$prefix/lib" != "$libdir"; then
--    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}"
+-    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="{${libdir}} {${prefix}/lib} ${TCL_PACKAGE_PATH}"
 +    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${libdir}/tcl8.6 ${prefix}/share/tcl8.6 ${libdir}/tk8.6 ${prefix}/share/tk8.6 ${TCL_PACKAGE_PATH}"
  else
--    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}"
+-    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="{${prefix}/lib} ${TCL_PACKAGE_PATH}"
 +    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${libdir}/tcl8.6 ${prefix}/share/tcl8.6 ${libdir}/tk8.6 ${prefix}/share/tk8.6 ${TCL_PACKAGE_PATH}"
  fi
  
diff --git a/tcl-8.6.10-conf.patch b/tcl-8.6.12-conf.patch
similarity index 74%
rename from tcl-8.6.10-conf.patch
rename to tcl-8.6.12-conf.patch
index 6dfa386..6e90fcb 100644
--- a/tcl-8.6.10-conf.patch
+++ b/tcl-8.6.12-conf.patch
@@ -1,8 +1,8 @@
 diff --git a/unix/tcl.m4 b/unix/tcl.m4
-index 0e146e4..180fff1 100644
+index f3d08ec..ed12cda 100644
 --- a/unix/tcl.m4
 +++ b/unix/tcl.m4
-@@ -1410,12 +1410,12 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
+@@ -1382,7 +1382,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
  	    # get rid of the warnings.
  	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
  
@@ -11,8 +11,11 @@ index 0e146e4..180fff1 100644
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS="-ldl"
  	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
+@@ -1398,7 +1398,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
+             esac
+ 
  	    AS_IF([test $doRpath = yes], [
--		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
+-		CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'])
 +		CC_SEARCH_FLAGS=''])
  	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
  	    AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"])
diff --git a/tcl-8.6.10-hidden.patch b/tcl-8.6.12-hidden.patch
similarity index 87%
rename from tcl-8.6.10-hidden.patch
rename to tcl-8.6.12-hidden.patch
index 00c2046..39304ec 100644
--- a/tcl-8.6.10-hidden.patch
+++ b/tcl-8.6.12-hidden.patch
@@ -1,8 +1,8 @@
 diff --git a/generic/tclInt.h b/generic/tclInt.h
-index 39fb740..bbe342b 100644
+index 949672b..5f3d493 100644
 --- a/generic/tclInt.h
 +++ b/generic/tclInt.h
-@@ -3277,7 +3277,7 @@ MODULE_SCOPE void	TclClockInit(Tcl_Interp *interp);
+@@ -3309,7 +3309,7 @@ MODULE_SCOPE void	TclClockInit(Tcl_Interp *interp);
  MODULE_SCOPE int	TclClockOldscanObjCmd(
  			    ClientData clientData, Tcl_Interp *interp,
  			    int objc, Tcl_Obj *const objv[]);
@@ -11,7 +11,7 @@ index 39fb740..bbe342b 100644
  			    Tcl_Interp *interp, int objc,
  			    Tcl_Obj *const objv[]);
  MODULE_SCOPE int	Tcl_ConcatObjCmd(ClientData clientData,
-@@ -3458,7 +3458,7 @@ MODULE_SCOPE int	Tcl_RenameObjCmd(ClientData clientData,
+@@ -3490,7 +3490,7 @@ MODULE_SCOPE int	Tcl_RenameObjCmd(ClientData clientData,
  MODULE_SCOPE int	Tcl_RepresentationCmd(ClientData clientData,
  			    Tcl_Interp *interp, int objc,
  			    Tcl_Obj *const objv[]);
diff --git a/tcl.spec b/tcl.spec
index 9ba5c5f..f2020e0 100644
--- a/tcl.spec
+++ b/tcl.spec
@@ -1,11 +1,11 @@
 %define majorver 8.6
-%define	vers %{majorver}.10
+%define	vers %{majorver}.12
 %{!?sdt:%define sdt 1}
 
 Summary: Tool Command Language, pronounced tickle
 Name: tcl
 Version: %{vers}
-Release: 5%{?dist}
+Release: 1%{?dist}
 Epoch: 1
 License: TCL
 URL: http://tcl.sourceforge.net/
@@ -17,9 +17,9 @@ BuildRequires: zlib-devel
 Provides: tcl(abi) = %{majorver}
 Obsoletes: tcl-tcldict <= %{vers}
 Provides: tcl-tcldict = %{vers}
-Patch0: tcl-8.6.10-autopath.patch
-Patch1: tcl-8.6.10-conf.patch
-Patch2: tcl-8.6.10-hidden.patch
+Patch0: tcl-8.6.12-autopath.patch
+Patch1: tcl-8.6.12-conf.patch
+Patch2: tcl-8.6.12-hidden.patch
 Patch3: tcl-8.6.10-tcltests-path-fix.patch
 
 %if %sdt
@@ -144,6 +144,10 @@ rm -rf %{buildroot}/%{_datadir}/%{name}%{majorver}/ldAix
 %{_datadir}/%{name}%{majorver}/tclAppInit.c
 
 %changelog
+* Tue Nov 23 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 1:8.6.12-1
+- New version
+  Related: rhbz#1488695
+
 * Thu Aug 20 2020 Jeff Law <law@redhat.com> - 1:8.6.10-5
 - Re-enable LTO