diff --git a/.cvsignore b/.cvsignore
index 5b7ad12..aa99623 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libglade-1.99.9.tar.gz
+libglade-2.0.0.tar.bz2
diff --git a/libglade2.spec b/libglade2.spec
index 3ba7318..2587223 100644
--- a/libglade2.spec
+++ b/libglade2.spec
@@ -1,26 +1,25 @@
 %define __libtoolize :
 
 %define libxml2_version 2.4.12-0.7
-%define gtk2_version 2.0
+%define gtk2_version 2.0.0
+%define pango_version 1.0.99
 
 Summary: The libglade library for loading user interfaces.
-Name:		libglade2
-Version: 	1.99.9
-Release: 	2
-Copyright:	LGPL
-Group:          System Environment/Libraries
-Source: 	libglade-%{version}.tar.gz
-Source2:        fixed-ltmain.sh
-URL:		http://www.gnome.org
-BuildRoot:	/var/tmp/%{name}-%{version}-root
-
-Patch: libglade-1.99.2.90-nogtkdoc.patch
-
-Requires:	libxml2 >= %{libxml2_version}
-BuildRequires:  libxml2-devel >= %{libxml2_version}
-BuildRequires:  gtk2-devel >= %{gtk2_version}
-BuildRequires:  automake
-BuildRequires:  autoconf253
+Name: libglade2
+Version: 2.0.0
+Release: 1
+Copyright: LGPL
+Group: System Environment/Libraries
+Source: libglade-%{version}.tar.bz2
+Source2: fixed-ltmain.sh
+URL: http://www.gnome.org
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Requires: libxml2 >= %{libxml2_version}
+BuildRequires: libxml2-devel >= %{libxml2_version}
+BuildRequires: gtk2-devel >= %{gtk2_version}
+BuildRequires: Xft
+BuildRequires: fontconfig
+BuildRequires: pango-devel >= %{pango_version}
 
 %description
 Libglade is a small library that allows a program to load its user
@@ -37,9 +36,9 @@ initial interface loading time, there is no performance tradeoff.
 %package devel
 Summary: The files needed for libglade application development.
 Group: Development/Libraries
-Requires:	%name = %{PACKAGE_VERSION}
-Requires:  libxml2-devel >= %{libxml2_version}
-Requires:  gtk2-devel >= %{gtk2_version}
+Requires: %name = %{PACKAGE_VERSION}
+Requires: libxml2-devel >= %{libxml2_version}
+Requires: gtk2-devel >= %{gtk2_version}
 Conflicts: libglade < 0.17
 
 %description devel
@@ -48,15 +47,6 @@ that you can use to develop libglade applications.
 
 %prep
 %setup -q -n libglade-%{version}
-%patch -p1 -b .nogtkdoc
-
-## if we add a --disable-gtk-doc upstream or fix the need-an-x-display problem 
-## we can get rid of this. remove automake build requires too
-libtoolize --copy --force
-autoheader-2.53
-aclocal
-automake
-autoconf-2.53
 
 %build
 
@@ -78,6 +68,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root)
 %doc AUTHORS ChangeLog NEWS README COPYING
 %{_libdir}/lib*.so.*
+%{_datadir}/xml
 
 %files devel
 %defattr(-, root, root)
@@ -87,9 +78,29 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*a
 %{_libdir}/pkgconfig/*
 %{_includedir}/*
-%{_datadir}/gtk-doc/html/*
+%{_datadir}/gtk-doc
 
 %changelog
+* Sat Jun 15 2002 Havoc Pennington <hp@redhat.com>
+- 2.0.0
+- check over file list, add XML DTD to it
+
+* Fri May 17 2002 Havoc Pennington <hp@redhat.com>
+- rebuild in different environment
+
+* Fri May 17 2002 Havoc Pennington <hp@redhat.com>
+- don't run auto*
+
+* Fri May 17 2002 Havoc Pennington <hp@redhat.com>
+- 1.99.12
+- remove gtk-doc hack, --disable-gtk-doc now works
+
+* Thu May  2 2002 Havoc Pennington <hp@redhat.com>
+- 1.99.11
+
+* Thu Apr  4 2002 Jeremy Katz <katzj@redhat.com>
+- 1.99.10
+
 * Tue Mar 19 2002 Alex Larsson <alexl@redhat.com>
 - Update autoconf dependency to 2.53
 
diff --git a/sources b/sources
index 8efa905..b825eda 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d07c8a66ef971d0753b4670676e1e7ab  libglade-1.99.9.tar.gz
+3f56880824523fe24381c03a411dea6a  libglade-2.0.0.tar.bz2