diff --git a/gdb-heap.spec b/gdb-heap.spec
index 8909b5a..aa9f7ba 100644
--- a/gdb-heap.spec
+++ b/gdb-heap.spec
@@ -5,14 +5,14 @@
 
 Name:           gdb-heap
 Version:        0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Extensions to gdb for debugging dynamic memory allocation
 
 # We build this arch-specific so that we can follow /lib vs /lib64 differences
 # in the location of the underlying glibc library
 
 Group:          Development/Libraries
-License:        LGPLv2.1+ and PSF
+License:        LGPLv2+ and PSF
 
 # Made from upstream 853132392ba48695af4d2ce3cda2b646ba1fad88
 # git clone git://git.fedorahosted.org/gdb-heap.git
@@ -26,7 +26,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python
 
-%global glibc_soversion 2.11.2
+%global glibc_version 2.11.2
+%global glibc_soversion %{glibc_version}
 %global glibc_dso_name  ld-%{glibc_soversion}.so
 %global glibc_debug_dir %{_prefix}/lib/debug/%{_lib}
 %global glibc_debug_dso_path %{glibc_debug_dir}/%{glibc_dso_name}.debug
@@ -37,7 +38,12 @@ BuildRequires:  python
 # This is autoloaded by gdb if the relevant glibc library is in memory.
 # It is only usable if that glibc library's debuginfo is available.
 # To do this, it must be at the correct location on the filesystem 
-Requires: %{glibc_debug_dso_path}
+# For this to work, we need a matching glibc version:
+Requires: glibc%{_isa} = %{glibc_version}
+
+# Strictly speaking, we really require:
+# Requires: glibc-debuginfo%{_isa} = %{glibc_version}
+# but it's debatable if that's a legitimate requirement
 
 %description
 gdb-heap adds a "heap" command to the gdb debugger, for use in debugging
@@ -50,7 +56,7 @@ dynamic memory allocation problems in user space.
 # empty
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 mkdir -p %{buildroot}/%{glibc_debug_dir}
 
@@ -68,7 +74,7 @@ cat gdbheap.py \
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
@@ -79,5 +85,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jul 27 2010 David Malcolm <dmalcolm@redhat.com> - 0.1-2
+- fix License tag
+- require specific glibc package version, rather than a specific file within
+glibc-debuginfo
+- standardize on buildroot rpm macro rather than RPM_BUILD_ROOT env var
+
 * Mon Jul 26 2010 David Malcolm <dmalcolm@redhat.com> - 0.1-1
 - initial packaging