diff --git a/pango.spec b/pango.spec
index 853a85a..8f6a40d 100644
--- a/pango.spec
+++ b/pango.spec
@@ -9,7 +9,7 @@
 Summary: System for layout and rendering of internationalized text
 Name: pango
 Version: 1.28.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 #VCS: git:git://git.gnome.org/pango
@@ -32,8 +32,9 @@ BuildRequires: libXft-devel
 BuildRequires: libXt-devel
 BuildRequires: cairo-devel >= %{cairo_version}
 BuildRequires: libthai-devel >= %{libthai_version}
-BuildRequires: gtk-doc
 BuildRequires: gobject-introspection-devel
+# Bootstrap requirements
+BuildRequires: gnome-common intltool gtk-doc
 
 # Look for pango.modules in an arch-specific directory
 Patch0: pango-1.21.4-lib64.patch
@@ -76,11 +77,10 @@ for the pango package.
 %build
 
 # We try hard to not link to libstdc++
-%configure \
-        --enable-gtk-doc \
-        --enable-doc-cross-references \
-        --enable-introspection \
-        --with-included-modules=basic-fc
+(if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi;
+ %configure $CONFIGFLAGS \
+          --enable-doc-cross-references \
+	  --with-included-modules=basic-fc )
 make
 
 %install
@@ -115,6 +115,7 @@ fi
 # Remove files that should not be packaged
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
 rm $RPM_BUILD_ROOT%{_libdir}/pango/*/modules/*.la
+(cd $RPM_BUILD_ROOT; find | while read f; do if file $f | grep -q ': ELF .*executable,'; then chrpath --delete $f; fi; done)
 
 PANGOXFT_SO=$RPM_BUILD_ROOT%{_libdir}/libpangoxft-1.0.so
 if ! test -e $PANGOXFT_SO; then
@@ -238,6 +239,9 @@ fi
 
 
 %changelog
+* Tue Jun 29 2010 Colin Walters <walters@pocket> - 1.28.1-2
+- Support builds from snapshots
+
 * Tue Jun 15 2010 Matthias Clasen <mclasen@redhat.com> - 1.28.1-1
 - Update to 1.28.1