diff --git a/tcl.spec b/tcl.spec
index 4a3d06d..deeb64e 100644
--- a/tcl.spec
+++ b/tcl.spec
@@ -2,15 +2,15 @@
 
 Summary: Tcl scripting language development environment
 Name: tcl
-Version: %{majorver}.11
-Release: 1.1
+Version: %{majorver}.12
+Release: 1
 License: BSD
 Group: Development/Languages
 URL: http://tcl.sourceforge.net/
 Source0: http://download.sourceforge.net/tcl/%{name}%{version}-src.tar.gz
-Source1: http://download.sourceforge.net/tcl/%{name}%{version}-html.tar.gz
+Source1: http://download.sourceforge.net/tcl/tk%{version}-src.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Buildrequires: autoconf sed
+Buildrequires: autoconf, sed, ksh
 Patch1: tcl-8.3.5-tclm4-soname.patch
 Patch2: tcl-8.4.5-lib-perm.patch
 Patch3: tcl8.3.5-tclConfig-package-path-90160.patch
@@ -56,7 +56,9 @@ Tcl/Tk is a powerful scripting language and GUI toolkit.
 This package contains the html manual.
 
 %prep
-%setup -n %{name}%{version} -q -b1
+%setup -T -D -c %{name}-%{version} -q -a 0 -a 1
+
+cd %{name}%{version}
 
 # define DT SONAME in shared lib
 %patch1 -p1 -b .1-soname
@@ -69,8 +71,13 @@ This package contains the html manual.
 cd unix
 autoconf
 
+# use ksh instead of bash (upstream knows bash-3.1 breaks, they are working
+# on a fix for 8.4.13 or a later release)
+sed -i -e 's,#! /bin/sh,#! /bin/ksh,g' configure
+sed -i -e 's,#! /bin/bash -norc,#! /bin/ksh,g' configure.in
+
 %build
-cd unix
+cd %{name}%{version}/unix
 %configure
 make %{?_smp_mflags} TCL_LIBRARY=%{_datadir}/%{name}%{majorver}
 
@@ -84,8 +91,12 @@ make %{?_smp_mflags} TCL_LIBRARY=%{_datadir}/%{name}%{majorver}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+cd %{name}%{version}
 make install -C unix INSTALL_ROOT=%{buildroot} TCL_LIBRARY=%{_datadir}/%{name}%{majorver}
 
+# generate HTML doc set
+make -C unix html HTML_DIR=`pwd`/html
+
 ln -s tclsh%{majorver} %{buildroot}%{_bindir}/tclsh
 
 # for linking with -l%{name}
@@ -125,7 +136,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 # this should be prefix/lib
 %{_prefix}/lib/%{name}%{majorver}
-%doc README changes license.terms
+%doc %{name}%{version}/README %{name}%{version}/changes
+%doc %{name}%{version}/license.terms
 
 %files devel
 %defattr(-,root,root)
@@ -138,9 +150,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files html
 %defattr(-,root,root)
-%doc html/*
+%doc %{name}%{version}/html/*
 
 %changelog
+* Thu Feb 02 2006 David Cantrell <dcantrell@redhat.com> - 8.4.12-1
+- Upgraded to tcl-8.4.12
+- Use ksh rather than bash for the configure script (known bug w/ bash-3.1)
+- Generate HTML docs from source
+- Add in the Tk source for HTML doc generation
+
 * Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
 - rebuilt