diff --git a/.cvsignore b/.cvsignore
index 1162954..c36aed5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 tix-8.1.4.tar.gz
+tix-8.4.0.tar.gz
diff --git a/sources b/sources
index 2b6072b..5baf2a5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1051ef1ec41c48c7ca8b9d6ad3436227  tix-8.1.4.tar.gz
+7fcd84a1a6e27e432cb07284b7a34317  tix-8.4.0.tar.gz
diff --git a/tix.spec b/tix.spec
index d1e3ec2..b2a8e62 100644
--- a/tix.spec
+++ b/tix.spec
@@ -1,20 +1,19 @@
-%define tixmajor 8.1
-%define tkmajor 8.4
+%define tixmajor 8.4
+%define tcltkver 8.4.12
 
 Summary: A set of extension widgets for Tk
 Name: tix
 Epoch: 1
-Version: %{tixmajor}.4
-Release: 100.1
+Version: %{tixmajor}.0
+Release: 1
 License: BSD
 Group: Development/Languages
 URL: http://tix.sourceforge.net/
 Source0: http://tix.sourceforge.net/dist/tix-%{version}.tar.gz
-Source1: tix-8.1.4-pkgIndex-datadir-83662.patch
+Patch0: tix-%{version}-relid.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Requires: tcl tk
-Buildrequires: tcl-devel tk-devel
-Patch1: tix-8.1.4-install-pkgIndex-datadir-83662.patch
+Requires: tcl >= %{tcltkver}, tk >= %{tcltkver}
+Buildrequires: tcl-devel >= %{tcltkver}, tk-devel >= %{tcltkver}
 
 %description
 Tix, the Tk Interface eXtension, is a powerful set of user interface
@@ -51,41 +50,49 @@ This package contains the tix documentation
 
 %prep
 %setup -q
-%patch1 -p1 -b .pkgIndex
+%patch0 -p1 -b .relid
+
+# patch 0 touches tcl.m4
+autoconf
 
 %build
-cd unix
-%configure --with-tclconfig=%{_libdir} --with-tkconfig=%{_libdir} --with-tclinclude=%{_includedir} --with-tkinclude=%{_includedir}
-cd tk%{tkmajor}
-patch -b --suffix .datadir < %SOURCE1
-%configure --enable-shared --with-tclconfig=%{_libdir} --with-tkconfig=%{_libdir} --with-tclinclude=%{_includedir} --with-tkinclude=%{_includedir}
-cd ..
-# ( cd itcl%{itcl_major}; 
-#   patch -b --suffix .datadir < %SOURCE20
-#   %%configure --with-itcl=%{tcltktop}/itcl%{itclvers} --enable-shared )
+%configure \
+   --with-tcl=%{_libdir} \
+   --with-tk=%{_libdir} \
+   --enable-64bit
 make all %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
-mkdir -p %{buildroot}%{_libdir} %{buildroot}%{_datadir}
-%makeinstall -C unix LIB_DIR=%{buildroot}%{_libdir} MAN_DIR=%{buildroot}%{_mandir} TIX_LIBRARY=%{buildroot}%{_datadir}/tix%{tixmajor} TCL_BIN_DIR=%{_bindir}
+# install demo scripts
+mkdir -p $RPM_BUILD_ROOT/usr/share/Tix%{tixmajor}
+cp -a demos $RPM_BUILD_ROOT/usr/share/Tix%{tixmajor}
 
-# for linking with -ltix
-ln -s libtix%{tixmajor}.%{tkmajor}.so %{buildroot}%{_libdir}/libtix.so
-# create tixwish symlink
-ln -s tixwish%{tixmajor}.%{tkmajor} %{buildroot}%{_bindir}/tixwish
+# move shared lib
+mv $RPM_BUILD_ROOT/usr/lib/Tix%{tixmajor}/libTix%{tixmajor}.so $RPM_BUILD_ROOT/usr/lib/libTix%{tixmajor}.so
+( cd $RPM_BUILD_ROOT/usr/lib
+  ln -sf libTix%{tixmajor}.so libTix.so
+  ln -sf libTix%{tixmajor}.so libtix.so
+)
 
-# XXX set execute bits on library so that requires are generated.
-chmod +x %{buildroot}%{_libdir}/libtix*.so
+# the header and man pages were in the previous package, keeping for now...
+mkdir -p $RPM_BUILD_ROOT/usr/include
+install -m 0644 generic/tix.h $RPM_BUILD_ROOT/usr/include/tix.h
 
-# remove buildroot traces
-perl -pi -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/tix-private|" %buildroot/%{_libdir}/tixConfig.sh
+mkdir -p $RPM_BUILD_ROOT/usr/share/man/mann
+cp man/*.n $RPM_BUILD_ROOT/usr/share/man/mann
 
 # ship docs except pdf
 rm -rf docs/pdf
 find docs -name .cvsignore -exec rm '{}' ';'
 
+# these files end up in the doc directory
+rm -f $RPM_BUILD_ROOT/usr/lib/Tix%{tixmajor}/README.txt
+rm -f $RPM_BUILD_ROOT/usr/lib/Tix%{tixmajor}/license.terms
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -93,27 +100,33 @@ rm -rf $RPM_BUILD_ROOT
 
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
-%{_bindir}/*
-%{_datadir}/tix%{tixmajor}
-%{_libdir}/libtix%{tixmajor}.%{tkmajor}.so
-%{_libdir}/libtixsam%{tixmajor}.%{tkmajor}.so
-%{_libdir}/tix%{tixmajor}
-%{_libdir}/tixConfig.sh
+/usr/lib/libTix%{tixmajor}.so
+%dir /usr/lib/Tix%{tixmajor}
+/usr/lib/Tix%{tixmajor}/*.tcl
+/usr/lib/Tix%{tixmajor}/bitmaps
+/usr/lib/Tix%{tixmajor}/pref
+/usr/share/Tix%{tixmajor}
 %doc *.txt *.html license.terms
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/*
+%{_includedir}/tix.h
 %{_libdir}/libtix.so
+%{_libdir}/libTix.so
 %{_mandir}/mann
 
 %files doc
 %defattr(-,root,root,-)
 %doc docs/*
 
+
 %changelog
+* Mon Feb 06 2006 David Cantrell <dcantrell@redhat.com> - 1:8.4.0-1
+- Upgraded to tix-8.4.0
+
 * Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
 - rebuilt