diff --git a/.cvsignore b/.cvsignore
index 3d5fb7b..7e330c4 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-pango-1.0.1.tar.gz
+pango-1.0.99.020606.tar.gz
diff --git a/pango.spec b/pango.spec
index 6632948..8c74cb8 100644
--- a/pango.spec
+++ b/pango.spec
@@ -5,11 +5,13 @@
 %define glib2_version %{glib2_base_version}-1
 %define pkgconfig_version 0.12
 %define freetype_version 2.0.9
+%define fontconfig_version 0.0.1.020603.0131
+%define xft_version 1.9.1.020603.0131
 
 Summary: System for layout and rendering of internationalized text.
 Name: pango
-Version: 1.0.1
-Release: 1
+Version: 1.0.99.020606
+Release: 4
 License: LGPL
 Group: System Environment/Libraries
 Source: ftp://ftp.gtk.org/pub/gtk/v2.0/pango-%{version}.tar.gz
@@ -19,14 +21,18 @@ BuildRoot: %{_tmppath}/pango-%{PACKAGE_VERSION}-root
 
 # We need to prereq this so we can run pango-querymodules
 Prereq: glib2 >= %{glib2_version}
-BuildRequires: autoconf253
+BuildRequires: /usr/bin/autoconf-2.53
 BuildRequires: /usr/bin/automake-1.4
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pkgconfig >= %{pkgconfig_version}
 BuildRequires: freetype-devel >= %{freetype_version}
+BuildRequires: fontconfig-devel >= %{fontconfig_version}
+BuildRequires: Xft-devel >= %{xft_version}
 BuildRequires: XFree86-devel >= 4.0.2
 Obsoletes: pango-gtkbeta, fribidi-gtkbeta
 
+Patch2: pango-1.0.99.020606-charmaps.patch
+
 %description
 Pango is a system for layout and rendering of internationalized text.
 
@@ -38,6 +44,8 @@ Requires: pango = %{PACKAGE_VERSION}
 Requires: XFree86-devel
 Requires: glib2-devel >= %{glib2_version}
 Requires: freetype-devel >= %{freetype_version}
+Requires: fontconfig-devel >= %{fontconfig_version}
+Requires: Xft-devel >= %{xft_version}
 Obsoletes: fribidi-gtkbeta-devel, pango-gtkbeta-devel
 
 %description devel
@@ -48,6 +56,31 @@ Install pango-devel if you want to develop programs which will use
 pango.
 
 %changelog
+* Sat Jun 08 2002 Havoc Pennington <hp@redhat.com>
+- rebuild in different environment
+
+* Sat Jun  8 2002 Havoc Pennington <hp@redhat.com>
+- devel package requires fontconfig/Xft devel packages
+
+* Fri Jun 07 2002 Havoc Pennington <hp@redhat.com>
+- rebuild in different environment
+
+* Thu Jun  6 2002 Owen Taylor <otaylor@redhat.com>
+- Snapshot with Xft2/fontconfig support
+
+* Wed May 29 2002 Owen Taylor <otaylor@redhat.com>
+- Version 1.0.2
+- Patch for charmaps problem
+
+* Sun May 26 2002 Tim Powers <timp@redhat.com>
+- automated rebuild
+
+* Wed May 22 2002 Havoc Pennington <hp@redhat.com>
+- rebuild in different environment
+
+* Wed May 22 2002 Havoc Pennington <hp@redhat.com>
+- add patch to adjust to newer version of freetype
+
 * Wed Apr  3 2002 Alex Larsson <alexl@redhat.com>
 - Update to version 1.0.1, remove patch
 
@@ -177,6 +210,8 @@ pango.
 %prep
 %setup -n pango-%{version}
 
+%patch2 -p1 -b .charmaps
+
 %build
 
 rm ltmain.sh && cp %{SOURCE2} ltmain.sh
diff --git a/sources b/sources
index 1be6860..f3c9b96 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-db360e208d12625229ea1740e3e2f0e2  pango-1.0.1.tar.gz
+326f6e7ca0b4971f4cc49208d94f82c4  pango-1.0.99.020606.tar.gz