diff --git a/.cvsignore b/.cvsignore
index c069542..6f11cb7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-ORBit2-2.6.0.tar.bz2
+ORBit2-2.8.2.tar.bz2
diff --git a/ORBit2.spec b/ORBit2.spec
index 54344f8..0b45a0b 100644
--- a/ORBit2.spec
+++ b/ORBit2.spec
@@ -1,21 +1,23 @@
-%define linc_version 1.0.1
-%define libidl_version 0.8.0
+%define libidl_version 0.8.2-1
 %define glib2_version 2.2.0
 
 Summary: A high-performance CORBA Object Request Broker.
 Name: ORBit2
-Version: 2.6.0
-Release: 2
+Version: 2.8.2
+Release: 1
 Source: %{name}-%{version}.tar.bz2
 Group: System Environment/Daemons
 License: LGPL/GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: /sbin/install-info
 URL: http://www.labs.redhat.com/orbit/
-BuildRequires: linc-devel >= %{linc_version}
 BuildRequires: libIDL-devel >= %{libidl_version}
 BuildRequires: glib2-devel >= %{glib2_version}
+BuildPreReq: libtool
+BuildPreReq: /usr/bin/aclocal-1.6
 BuildRequires: pkgconfig >= 0.14
+BuildRequires: gtk-doc >= 1.1
+Patch0: ORBit2-2.8.1-gross-hack.patch
 
 %description
 ORBit is a high-performance CORBA (Common Object Request Broker 
@@ -34,11 +36,10 @@ Summary: Development libraries, header files and utilities for ORBit.
 Group: Development/Libraries
 Requires: indent
 Requires: glib2-devel
-Requires: linc-devel >= %{linc_version}
 Requires: libIDL-devel >= %{libidl_version}
 Requires: ORBit2 = %{version}
 Requires: glib2-devel >= %{glib2_version}
-Conflicts: ORBit-devel <= 0.5.8
+Conflicts: ORBit-devel <= 1:0.5.8
 
 %description devel
 ORBit is a high-performance CORBA (Common Object Request Broker
@@ -57,11 +58,16 @@ write such programs, you'll also need to install the ORBIT package.
 #  exit 1
 #fi
 
+%patch0 -p1 -b .gross-hack
+
 echo "glib-2.0 version is `pkg-config --modversion glib-2.0`"
 
 %build
-%configure
-
+aclocal-1.6
+libtoolize --force
+automake-1.6
+autoconf
+%configure --disable-gtk-doc
 make ## %{?_smp_mflags} 
 
 %install
@@ -97,8 +103,50 @@ rm -rf %{buildroot}
 %{_includedir}/*
 %{_datadir}/aclocal/*
 %{_datadir}/idl/orbit-2.0
+%{_bindir}/linc-cleanup-sockets
+%{_datadir}/gtk-doc
 
 %changelog
+* Wed Oct 22 2003 Jeremy Katz <katzj@redhat.com> 2.8.2-1
+- 2.8.2
+
+* Mon Oct  6 2003 Jeremy Katz <katzj@redhat.com> 2.8.1.90-1
+- update to CVS snap off of gnome-2-4 branch
+
+* Fri Oct  3 2003 Alexander Larsson <alexl@redhat.com> 2.8.1-1
+- 2.8.1
+- BuildRequire a newer gtk-doc
+
+* Wed Sep  3 2003 Alexander Larsson <alexl@redhat.com> 2.8.0-1
+- 2.8.0
+
+* Mon Aug 11 2003 Alexander Larsson <alexl@redhat.com> 2.7.5-5
+- Remove obsoletes linc line
+
+* Mon Aug 11 2003 Alexander Larsson <alexl@redhat.com> 2.7.5-4
+- Add gtk-doc to devel
+
+* Thu Aug  7 2003 Jonathan Blandford <jrb@redhat.com>
+- rebuild for 2.4
+
+* Fri Jul 11 2003 Havoc Pennington <hp@redhat.com>
+- automated rebuild
+
+* Mon Jul  7 2003 Havoc Pennington <hp@redhat.com> 2.6.2-1
+- 2.6.2
+
+* Fri Jun 27 2003 Havoc Pennington <hp@redhat.com> 2.6.0-5
+- add lame _exit(0) hack to work around problem on ia64 temporarily
+
+* Thu Jun 26 2003 Havoc Pennington <hp@redhat.com> 2.6.0-4
+- rebuild
+
+* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Tue Jun  3 2003 Jeff Johnson <jbj@redhat.com>
+- add explicit epoch's where needed.
+
 * Mon Feb 10 2003 Bill Nottingham <notting@redhat.com> 2.6.0-2
 - own %{_datadir}/idl/orbit-2.0 (#74020)
 
diff --git a/sources b/sources
index fcf1386..be5d7af 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c0b26f13f63db89503234d9367962e23  ORBit2-2.6.0.tar.bz2
+f3c10a7857f26ccf0a690f37bb8f62c1  ORBit2-2.8.2.tar.bz2