diff --git a/meta/packages/tcltk/tcl/tcl-add-soname.patch b/meta/packages/tcltk/tcl/tcl-add-soname.patch
index 38762644cd..9cb816da51 100644
--- a/meta/packages/tcltk/tcl/tcl-add-soname.patch
+++ b/meta/packages/tcltk/tcl/tcl-add-soname.patch
@@ -1,72 +1,50 @@
---- clean/tcl8.4.19/unix/configure	2008-04-17 21:29:49.000000000 +0100
-+++ tcl8.4.19/unix/configure	2009-11-13 11:46:36.000000000 +0000
-@@ -3065,6 +3065,7 @@
- 	    SHLIB_CFLAGS="-fPIC"
+Index: unix/configure
+===================================================================
+--- unix.orig/configure
++++ unix/configure
+@@ -6726,6 +6726,7 @@ fi
+ 	    # symbols when dynamically loaded into tclsh.
  	    SHLIB_LD_LIBS='${LIBS}'
  	    SHLIB_SUFFIX=".so"
 +	    SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.so.0'
  
- 	    CFLAGS_OPTIMIZE=-O2
- 	    # egcs-2.91.66 on Redhat Linux 6.0 generates lots of warnings 
-@@ -3072,12 +3073,15 @@
- 	    # get rid of the warnings.
- 	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
- 
-+	    # following line added by CW for Debian GNU/Linux
-+	    TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\${TCL_LIB_FILE}"
-+
- 	    if test "$have_dl" = yes; then
- 		SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
- 		DL_OBJS="tclLoadDl.o"
- 		DL_LIBS="-ldl"
- 		LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
--		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-+		CC_SEARCH_FLAGS=""
- 		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- 	    else
- 		ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'`
-@@ -4299,7 +4303,7 @@
- 
-     if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then
-         LIB_SUFFIX=${SHARED_LIB_SUFFIX}
--        MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
-+        MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS} ; ln -s $(LIB_FILE) `basename $(LIB_FILE) .so.0`\${SHLIB_SUFFIX}'
-         INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)'
-     else
-         LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
---- clean/tcl8.4.19/unix/tcl.m4	2008-04-17 21:29:49.000000000 +0100
-+++ tcl8.4.19/unix/tcl.m4	2009-11-13 11:53:57.000000000 +0000
-@@ -1337,6 +1337,7 @@
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    LD_LIBRARY_PATH_VAR="LIBPATH"
+Index: unix/tcl.m4
+===================================================================
+--- unix.orig/tcl.m4
++++ unix/tcl.m4
+@@ -1424,6 +1424,7 @@ dnl AC_CHECK_TOOL(AR, ar)
  	    SHLIB_CFLAGS="-fPIC"
  	    SHLIB_LD_LIBS='${LIBS}'
  	    SHLIB_SUFFIX=".so"
 +	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.0'
  
- 	    CFLAGS_OPTIMIZE=-O2
+ 	    CFLAGS_OPTIMIZE="-O2"
  	    # egcs-2.91.66 on Redhat Linux 6.0 generates lots of warnings 
-@@ -1344,12 +1345,15 @@
+@@ -1431,12 +1432,15 @@ dnl AC_CHECK_TOOL(AR, ar)
  	    # get rid of the warnings.
  	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
  
 +	    # following line added by CW for Debian GNU/Linux
 +	    TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\${TCL_LIB_FILE}.0"
 +
- 	    if test "$have_dl" = yes; then
- 		SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
- 		DL_OBJS="tclLoadDl.o"
- 		DL_LIBS="-ldl"
- 		LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
--		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-+		CC_SEARCH_FLAGS=""
- 		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- 	    else
- 		AC_CHECK_HEADER(dld.h, [
-@@ -2117,7 +2121,7 @@
+ 	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"
+ 	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
+ 	    AS_IF([test $doRpath = yes], [
+-		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"])
+ 	    AS_IF([test $do64bit = yes], [
+@@ -2079,7 +2083,7 @@ dnl # preprocessing tests use only CPPFL
  
-     if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then
+     AS_IF([test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""], [
          LIB_SUFFIX=${SHARED_LIB_SUFFIX}
 -        MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
-+        MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS} ; ln -s $(LIB_FILE) `basename $(LIB_FILE) .so.0`\${SHLIB_SUFFIX}'
-         INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)'
-     else
++        MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
+         INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)"/$(LIB_FILE)'
+     ], [
          LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
diff --git a/meta/packages/tcltk/tcl_8.4.19.bb b/meta/packages/tcltk/tcl_8.5.8.bb
similarity index 56%
rename from meta/packages/tcltk/tcl_8.4.19.bb
rename to meta/packages/tcltk/tcl_8.5.8.bb
index 33d600bc79..7734c8833e 100644
--- a/meta/packages/tcltk/tcl_8.4.19.bb
+++ b/meta/packages/tcltk/tcl_8.5.8.bb
@@ -2,11 +2,19 @@ DESCRIPTION = "Tool Command Language"
 LICENSE = "tcl"
 SECTION = "devel/tcltk"
 HOMEPAGE = "http://tcl.sourceforge.net"
-PR = "r3"
+LIC_CHKSUM_FILES = "file://../license.terms;md5=7b4d3c71b2d9a8c1b373609867975570 \
+    file://../compat/license.terms;md5=7b4d3c71b2d9a8c1b373609867975570 \
+    file://../library/license.terms;md5=7b4d3c71b2d9a8c1b373609867975570 \
+    file://../macosx/license.terms;md5=7b4d3c71b2d9a8c1b373609867975570 \
+    file://../tests/license.terms;md5=7b4d3c71b2d9a8c1b373609867975570 \
+    file://../win/license.terms;md5=7b4d3c71b2d9a8c1b373609867975570 \
+    "
+
+PR = "r0"
 
 SRC_URI = "\
   ${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \
-  file://tcl-add-soname.patch;patch=1;pnum=2"
+  file://tcl-add-soname.patch"
 
 S = "${WORKDIR}/tcl${PV}/unix"
 
@@ -25,8 +33,8 @@ do_compile_prepend() {
 
 do_install() {
 	autotools_do_install
-	oe_libinstall -so libtcl8.4 ${STAGING_LIBDIR}
-	ln -sf ./tclsh8.4 ${D}${bindir}/tclsh
+	oe_libinstall -so libtcl8.5 ${STAGING_LIBDIR}
+	ln -sf ./tclsh8.5 ${D}${bindir}/tclsh
 	sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh
 	sed -i "s,-L${libdir},," tclConfig.sh
 	install -d ${STAGING_BINDIR_CROSS}/
@@ -40,8 +48,8 @@ do_install() {
 }
 
 PACKAGES =+ "${PN}-lib"
-FILES_${PN}-lib = "${libdir}/libtcl8.4.so.*"
-FILES_${PN} += "${libdir}/tcl8.4"
+FILES_${PN}-lib = "${libdir}/libtcl8.5.so.*"
+FILES_${PN} += "${libdir}/tcl8.5"
 FILES_${PN}-dev += "${libdir}/tclConfig.sh"
 
 BBCLASSEXTEND = "native"