diff --git a/.cvsignore b/.cvsignore
index 88e5bb7..be31b60 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-shell-2.31.2.tar.bz2
+gnome-shell-2.31.5.tar.bz2
diff --git a/gnome-shell.spec b/gnome-shell.spec
index 154f671..cf19edf 100644
--- a/gnome-shell.spec
+++ b/gnome-shell.spec
@@ -1,6 +1,6 @@
 Name:           gnome-shell
-Version:        2.31.2
-Release:        3%{?dist}
+Version:        2.31.5
+Release:        1%{?dist}
 Summary:        Window management and application launching for GNOME
 
 Group:          User Interface/Desktops
@@ -11,7 +11,7 @@ Source0:        http://ftp.gnome.org/pub/GNOME/sources/gnome-shell/2.27/%{name}-
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %define clutter_version 1.2.8
-%define gobject_introspection_version 0.6.12
+%define gobject_introspection_version 0.9.2
 %define mutter_version 2.31.2
 %define gjs_version 0.7
 
@@ -30,6 +30,8 @@ BuildRequires:  intltool
 # used in unused BigThemeImage
 BuildRequires:  librsvg2-devel
 BuildRequires:  mutter-devel >= %{mutter_version}
+# Bootstrap requirements
+BuildRequires: gtk-doc gnome-common
 
 # User interface to switch to GNOME Shell
 Requires:       desktop-effects
@@ -63,12 +65,8 @@ easy to use experience.
 %setup -q
 
 %build
-%configure
-
-# Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-
+(if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi;
+ %configure --disable-static)
 make V=1 %{?_smp_mflags}
 
 %install
@@ -122,6 +120,10 @@ gconftool-2 --makefile-install-rule \
   > /dev/null || :
 
 %changelog
+* Mon Jul 12 2010 Colin Walters <walters@verbum.org> - 2.31.5-1
+- New upstream version
+- Drop rpath goop, shouldn't be necessary any more
+
 * Fri Jun 25 2010 Colin Walters <walters@megatron> - 2.31.2-3
 - Drop gir-repository-devel build dependency
 
diff --git a/sources b/sources
index e7b3d80..51f6a52 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-42f593eddbe3dcc2552f8ac2ca3748b6  gnome-shell-2.31.2.tar.bz2
+ec104431e34ed9fb98a3216f6ef9f0f0  gnome-shell-2.31.5.tar.bz2