diff --git a/.cvsignore b/.cvsignore
index b1cd97b..76908e0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-pango-1.1.0.tar.gz
+pango-1.1.1.tar.gz
diff --git a/pango.spec b/pango.spec
index 532be76..f72b2d2 100644
--- a/pango.spec
+++ b/pango.spec
@@ -7,8 +7,8 @@
 
 Summary: System for layout and rendering of internationalized text.
 Name: pango
-Version: 1.1.0
-Release: 4
+Version: 1.1.1
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
 Source: ftp://ftp.gtk.org/pub/gtk/v2.1/pango-%{version}.tar.gz
@@ -18,8 +18,6 @@ BuildRoot: %{_tmppath}/pango-%{PACKAGE_VERSION}-root
 # We need to prereq this so we can run pango-querymodules
 Prereq: glib2 >= %{glib2_version}
 BuildRequires: libtool >= 1.4.2-10
-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}
@@ -30,8 +28,6 @@ Obsoletes: pango-gtkbeta, fribidi-gtkbeta
 
 Patch1: pango-1.1.0-slighthint.patch
 Patch3: pango-1.0.99.020606-xfonts.patch
-# Actually use language tags at the rendering layer
-Patch4: pango-1.1.0-langtag.patch
 
 %description
 Pango is a system for layout and rendering of internationalized text.
@@ -55,9 +51,58 @@ and developer docs for the pango package.
 Install pango-devel if you want to develop programs which will use
 pango.
 
+%prep
+%setup -q -n pango-%{version}
+
+%patch1 -p1 -b .slighthint
+%patch3 -p1 -b .xfonts
+
+%build
+
+%configure --without-qt --disable-gtk-doc
+make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%makeinstall
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+/sbin/ldconfig
+%{_prefix}/bin/pango-querymodules > /etc/pango/pango.modules
+
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-, root, root)
+%doc README AUTHORS COPYING ChangeLog TODO
+%doc examples/HELLO.utf8
+%{_prefix}/lib/libpango*-*.so.*
+%{_prefix}/bin/pango-querymodules
+%{_prefix}/lib/pango
+%config /etc/pango/pangox.aliases
+%ghost /etc/pango/pango.modules
+
+
+%files devel
+%defattr(-, root, root)
+%{_prefix}/lib/libpango*.so
+%{_prefix}/include/*
+%{_prefix}/lib/pkgconfig/*
+%{_prefix}/share/gtk-doc/*
+
+
 %changelog
+* Wed Aug 21 2002 Owen Taylor <otaylor@redhat.com>
+- Version 1.1.1 (main change, fixes font selection for FT2 backend, 
+  as in gdmgreeter)
+
 * Thu Aug 15 2002 Owen Taylor <otaylor@redhat.com>
 - Fix linked list manipulation problem that was causing hang for anaconda
+- Fix warning from loading mini-fonts with context == NULL
 
 * Wed Aug 14 2002 Owen Taylor <otaylor@redhat.com>
 - Fix major memory leak in the last patch
@@ -235,56 +280,3 @@ pango.
 
 * Fri Feb 11 2000 Owen Taylor <otaylor@redhat.com>
 - Created spec file
-
-%prep
-%setup -q -n pango-%{version}
-
-%patch1 -p1 -b .slighthint
-%patch3 -p1 -b .xfonts
-%patch4 -p1 -b .langtag
-
-%build
-
-# Fix DESTDIR relink problem
-libtoolize --force --copy
-
-# .firstchar patch modifies configure.in, the other ones
-# are run to keep them from being rerun on make.
-aclocal-1.4
-automake-1.4
-autoconf-2.53
-autoheader-2.53
-%configure --without-qt --disable-gtk-doc
-make
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-%makeinstall
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-/sbin/ldconfig
-%{_prefix}/bin/pango-querymodules > /etc/pango/pango.modules
-
-%postun -p /sbin/ldconfig
-
-%files
-%defattr(-, root, root)
-%doc README AUTHORS COPYING ChangeLog TODO
-%doc examples/HELLO.utf8
-%{_prefix}/lib/libpango*-*.so.*
-%{_prefix}/bin/pango-querymodules
-%{_prefix}/lib/pango
-%config /etc/pango/pangox.aliases
-%ghost /etc/pango/pango.modules
-
-
-%files devel
-%defattr(-, root, root)
-%{_prefix}/lib/libpango*.so
-%{_prefix}/include/*
-%{_prefix}/lib/pkgconfig/*
-%{_prefix}/share/gtk-doc/*
diff --git a/sources b/sources
index 87ce318..3d8c59d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a541d7bb594629904272fe7f676ffb23  pango-1.1.0.tar.gz
+1922d1c1a59644d7a16250c8f4710e5b  pango-1.1.1.tar.gz