Index: general.ent
===================================================================
--- general.ent	(revision 7f109f5e01ec49273a56102c5827a0f5a11cd8db)
+++ general.ent	(revision dd01532b9af3cbee81a6dba490b50c76b307b019)
@@ -4,5 +4,5 @@
 -->
 
-<!ENTITY day          "09">                   <!-- Always 2 digits -->
+<!ENTITY day          "10">                   <!-- Always 2 digits -->
 <!ENTITY month        "03">                   <!-- Always 2 digits -->
 <!ENTITY year         "2010">
@@ -278,6 +278,6 @@
 <!ENTITY python-majorver              "2.6">
 <!ENTITY ruby-version                 "1.8.7-p248">
-<!ENTITY tcl-version                  "8.5.6">
-<!ENTITY tk-version                   "8.5.6">
+<!ENTITY tcl-version                  "8.5.8">
+<!ENTITY tk-version                   "8.5.8">
 
 <!-- Perl module versions used in the Perl Modules instructions -->
Index: general/prog/tcl.xml
===================================================================
--- general/prog/tcl.xml	(revision 7f109f5e01ec49273a56102c5827a0f5a11cd8db)
+++ general/prog/tcl.xml	(revision dd01532b9af3cbee81a6dba490b50c76b307b019)
@@ -7,14 +7,14 @@
   <!ENTITY tcl-download-http "&sourceforge-repo;/tcl/tcl&tcl-version;-src.tar.gz">
   <!ENTITY tcl-download-ftp  "&gentoo-ftp-repo;/tcl&tcl-version;-src.tar.gz">
-  <!ENTITY tcl-md5sum        "d0b0b3ff7600ff63135c710b575265cd">
-  <!ENTITY tcl-size          "4.2 MB">
-  <!ENTITY tcl-buildsize     "33 MB">
-  <!ENTITY tcl-time          "0.5 SBU (additional 2.0 SBU to run the test suite)">
+  <!ENTITY tcl-md5sum        "7f123e53b3daaaba2478d3af5a0752e3">
+  <!ENTITY tcl-size          "4.4 MB">
+  <!ENTITY tcl-buildsize     "62 MB (includes documentation installation)">
+  <!ENTITY tcl-time          "0.5 SBU (additional 1.2 SBU to run the test suite)">
 
   <!ENTITY tcl-doc-download  "&sourceforge-repo;/tcl/tcl&tcl-version;-html.tar.gz">
-  <!ENTITY tcl-doc-md5sum    "e287dcb71b7e6ba9c7b1606a2020e61c">
+  <!ENTITY tcl-doc-md5sum    "788cacd89d8cf97b23f53500ede910bc">
   <!ENTITY tcl-doc-size      "925 KB">
 
-  <!-- Ensure this is updated when Tcl moves to the 8.5.x branch -->
+  <!-- Ensure this is updated when Tcl moves from the 8.5.x branch -->
   <!ENTITY tcl-ver           "8.5">
 ]>
@@ -104,5 +104,4 @@
     -e "s@^\(TCL_SRC_DIR='\).*@\1/usr/include'@" \
     -e "/TCL_B/s@='\(-L\)\?.*unix@='\1/usr/lib@" \
-    -e "/SEARCH/s/=.*/=''/" \
     tclConfig.sh</userinput></screen>
 
@@ -113,5 +112,6 @@
 <screen role="root"><userinput>make install &amp;&amp;
 make install-private-headers &amp;&amp;
-ln -v -sf tclsh&tcl-ver; /usr/bin/tclsh</userinput></screen>
+ln -v -sf tclsh&tcl-ver; /usr/bin/tclsh &amp;&amp;
+chmod -v 755 /usr/lib/libtcl&tcl-ver;.so</userinput></screen>
 
     <para>If you downloaded the optional documentation, install it by issuing
Index: general/prog/tk.xml
===================================================================
--- general/prog/tk.xml	(revision 7f109f5e01ec49273a56102c5827a0f5a11cd8db)
+++ general/prog/tk.xml	(revision dd01532b9af3cbee81a6dba490b50c76b307b019)
@@ -7,10 +7,10 @@
   <!ENTITY tk-download-http "&sourceforge-repo;/tcl/tk&tk-version;-src.tar.gz">
   <!ENTITY tk-download-ftp  "&gentoo-ftp-repo;/tk&tk-version;-src.tar.gz">
-  <!ENTITY tk-md5sum        "7da2e00adddc7eed6080df904579d94e">
-  <!ENTITY tk-size          "3.6 MB">
-  <!ENTITY tk-buildsize     "21 MB">
+  <!ENTITY tk-md5sum        "13bf90602e16fc530e05196431021dc6">
+  <!ENTITY tk-size          "3.7 MB">
+  <!ENTITY tk-buildsize     "32 MB">
   <!ENTITY tk-time          "0.5 SBU">
 
-  <!-- Ensure this is updated when Tk moves to the 8.5.x branch -->
+  <!-- Ensure this is updated when Tk moves from the 8.5.x branch -->
   <!ENTITY tk-ver           "8.5">
 ]>
@@ -83,5 +83,4 @@
     -e "s@^\(TK_SRC_DIR='\).*@\1/usr/include'@" \
     -e "/TK_B/s@='\(-L\)\?.*unix@='\1/usr/lib@" \
-    -e "/SEARCH/s/=.*/=''/" \
     tkConfig.sh</userinput></screen>
 
@@ -95,15 +94,6 @@
 <screen role="root"><userinput>make install &amp;&amp;
 make install-private-headers &amp;&amp;
-ln -v -sf wish&tk-ver; /usr/bin/wish</userinput></screen>
-
-<!-- This is removed per discussion and fairly vigorous testing
-install -v -m755 -d /usr/include/tk&tk-ver;/{unix,generic} &amp;&amp;
-install -v -m644 *.h /usr/include/tk&tk-ver;/unix/ &amp;&amp;
-install -v -m644 ../generic/*.h /usr/include/tk&tk-ver;/generic/ &amp;&amp;
-rm -v -f /usr/include/tk&tk-ver;/generic/tk{,{,Plat}Decls}.h &amp;&amp;
-ln -v -nsf ../../include/tk&tk-ver; /usr/lib/tk&tk-ver;/include &amp;&amp;
-ln -v -sf libtk&tk-ver;.so /usr/lib/libtk.so &amp;&amp;
-ln -v -sf wish&tk-ver; /usr/bin/wish</userinput></screen>
--->
+ln -v -sf wish&tk-ver; /usr/bin/wish &amp;&amp;
+chmod -v 755 destdir/usr/lib/libtk8.5.so</userinput></screen>
 
   </sect2>
@@ -130,12 +120,4 @@
     can utilize it. This <command>sed</command> removes the references to the
     build directory and replaces them with saner system-wide locations.</para>
-
-    <!--
-    <para><command>install ...</command>: These commands install the internal
-    headers into a system-wide location.</para>
-
-    <para><command>ln -v -sf ...</command>: These commands create compatibility
-    symbolic links.</para>
-    -->
 
   </sect2>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 7f109f5e01ec49273a56102c5827a0f5a11cd8db)
+++ introduction/welcome/changelog.xml	(revision dd01532b9af3cbee81a6dba490b50c76b307b019)
@@ -43,4 +43,13 @@
 
     <listitem>
+      <para>March 10th, 2010</para>
+      <itemizedlist>
+        <listitem>
+          <para>[randy] - Updated Tcl and Tk to version 8.5.8.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>March 9th, 2010</para>
       <itemizedlist>
