diff --git a/tcl-unload.patch b/tcl-unload.patch
new file mode 100644
index 0000000..f364cd3
--- /dev/null
+++ b/tcl-unload.patch
@@ -0,0 +1,35 @@
+Index: generic/tclLoad.c
+===================================================================
+--- generic/tclLoad.c.orig
++++ generic/tclLoad.c
+@@ -9,7 +9,7 @@
+  * See the file "license.terms" for information on usage and redistribution of
+  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
+  *
+- * RCS: @(#) $Id: tclLoad.c,v 1.16.4.2 2008/11/14 00:22:39 nijtmans Exp $
++ * RCS: @(#) $Id: tclLoad.c,v 1.16 2007/02/20 23:24:03 nijtmans Exp $
+  */
+ 
+ #include "tclInt.h"
+@@ -795,9 +795,7 @@ Tcl_UnloadObjCmd(
+ 
+ 	    if (unLoadProcPtr != NULL) {
+ 		Tcl_MutexLock(&packageMutex);
+-		if ((pkgPtr->unloadProc != NULL) || (unLoadProcPtr == TclFSUnloadTempFile)) {
+-		    (*unLoadProcPtr)(pkgPtr->loadHandle);
+-		}
++		(*unLoadProcPtr)(pkgPtr->loadHandle);
+ 
+ 		/*
+ 		 * Remove this library from the loaded library cache.
+@@ -1154,9 +1152,7 @@ TclFinalizeLoad(void)
+ 
+ 	if (pkgPtr->fileName[0] != '\0') {
+ 	    Tcl_FSUnloadFileProc *unLoadProcPtr = pkgPtr->unLoadProcPtr;
+-	    if ((unLoadProcPtr != NULL)
+-		    && ((pkgPtr->unloadProc != NULL)
+-		    || (unLoadProcPtr == TclFSUnloadTempFile))) {
++	    if (unLoadProcPtr != NULL) {
+ 		(*unLoadProcPtr)(pkgPtr->loadHandle);
+ 	    }
+ 	}
diff --git a/tcl.changes b/tcl.changes
index 6572168..a74a83f 100644
--- a/tcl.changes
+++ b/tcl.changes
@@ -1,3 +1,41 @@
+-------------------------------------------------------------------
+Wed Nov 18 16:18:20 CET 2009 - max@suse.de
+
+- Bugfix release 8.5.8.
+  * [info frame] account for continuation lines
+  * account for ia64_32 => platform 1.0.5
+  * improved error message in tcltest => tcltest 2.3.2
+  * Broken DST applied EU rules to US zones
+  * [sf#2446662] uniformly declare EOF on RST on sockets
+  * [sf#1028264] delay WSACleanup() from under our feet
+  * [sf#2785893] find command in deleted namespace
+  * [sf#2798543] incorrect [expr] integer ** results
+  * [sf#2801413] overflow in [format]
+  * [sf#2802881] corrected compile env context
+  * [sf#2819200] underflow settings on MIPS systems
+  * [sf#2820349] plug event leak in notifier
+  * [sf#2826248] crash in Tcl_GetChannelHandle
+  * [sf#2830354] overflow in [format]
+  * [sf#2827000] reflected channels can signal EGAIN
+  * [sf#2806250] EIAS violation in ~foo pathnames
+  * [sf#2837800] [glob */foo] return ./~x/foo
+  * [sf#2845535] overflows in [format]
+  * [sf#2849860] http handle "quoted" charset value
+  * [sf#1941434] broken tclTomMath.h includes
+  * [sf#2871908] leaked hash table
+  * [sf#2874678] bignum leak in [dict incr]
+  * [sf#2629338] crash in var unset traces
+  * [sf#2107634] extend [read] and [gets] to Tcl string limits
+  * [sf#2882561] Haiku OS signal support
+  * [sf#2800740] halved bignum memory on 64-bit systems
+    POTENTIAL INCOMPATIBILITY
+  * [sf#2854929] TM search path support in Safe Base
+  * [sf#2888099] [close] loses ENOSPC error
+  * [sf#2891171] RFC 3986 compliance for ? in URL => http 2.7.5
+  * [sf#2895565] [fcopy -size] miscounts when converting encodings
+
+- Added tcl-unload.patch to fix a crash in the browser plugin.
+
 -------------------------------------------------------------------
 Sun Aug  2 18:48:13 UTC 2009 - jansimon.moeller@opensuse.org
 
diff --git a/tcl.spec b/tcl.spec
index 73ee3ee..4be5922 100644
--- a/tcl.spec
+++ b/tcl.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package tcl (Version 8.5.7)
+# spec file for package tcl (Version 8.5.8)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -20,8 +20,8 @@
 
 Name:           tcl
 Url:            http://www.tcl.tk
-Version:        8.5.7
-Release:        3
+Version:        8.5.8
+Release:        1
 %define TCL_MINOR %(echo %version | cut -c1-3)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        The Tcl Programming Language
@@ -40,6 +40,7 @@ Source1:        tcl-rpmlintrc
 Source2:        baselibs.conf
 Source3:        macros.tcl
 Patch0:         tcl.patch
+Patch1:         tcl-unload.patch
 
 %description
 Tcl (Tool Command Language) is a very powerful but easy to learn
@@ -86,11 +87,11 @@ Authors:
 %prep
 %setup -q -n %name%version
 %patch0
+%patch1
 
 %build
 cd unix
 %configure \
-	--enable-treads \
 	--enable-man-symlinks \
 	--enable-man-compression=gzip
 %define scriptdir %_libdir/tcl
diff --git a/tcl8.5.7-src.tar.bz2 b/tcl8.5.7-src.tar.bz2
deleted file mode 100644
index f133b3f..0000000
--- a/tcl8.5.7-src.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8bafabc68a8c2f06ac1e0790aa77c3df026e188b8639d067ec09b4d9cc919f4f
-size 3350196
diff --git a/tcl8.5.8-src.tar.bz2 b/tcl8.5.8-src.tar.bz2
new file mode 100644
index 0000000..f69e06a
--- /dev/null
+++ b/tcl8.5.8-src.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:57b95cc57ec7d371f866d0926ffb98ebaed24c9867e84977ae9f7977e99f26a4
+size 3393251