diff --git a/gdb-heap.spec b/gdb-heap.spec
index ba56885..81910df 100644
--- a/gdb-heap.spec
+++ b/gdb-heap.spec
@@ -4,7 +4,7 @@
 # (I tried using _enable_debug_packages but that didn't work for some reason)
 
 Name:           gdb-heap
-Version:        0.2
+Version:        0.3
 Release:        1%{?dist}
 Summary:        Extensions to gdb for debugging dynamic memory allocation
 
@@ -16,9 +16,9 @@ License:        LGPLv2+ and PSF
 
 # Made from upstream commit a35f2934f7b7afc2f305db2b6360a269d3e39901
 # git clone git://git.fedorahosted.org/gdb-heap.git
-# mv gdb-heap gdb-heap-0.2
-# tar cfvj gdb-heap-0.2.tar.bz2 gdb-heap-0.2
-# scp gdb-heap-0.2.tar.bz2 dmalcolm@fedorahosted.org:gdb-heap
+# mv gdb-heap gdb-heap-0.3
+# tar cfvj gdb-heap-0.3.tar.bz2 gdb-heap-0.3
+# scp gdb-heap-0.3.tar.bz2 dmalcolm@fedorahosted.org:gdb-heap
 
 URL:            https://fedorahosted.org/gdb-heap/
 Source0:        https://fedorahosted.org/released/gdb-heap/gdb-heap-%{version}.tar.bz2
@@ -26,24 +26,28 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python
 
-%global glibc_version 2.11.2
+%global glibc_version 2.12.90
 %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
-%global script_install_path  %{glibc_debug_dso_path}-gdb.py
+%global gdb_autoload_dir %{_datadir}/gdb/auto-load
+%global script_install_dir %{gdb_autoload_dir}/%{_lib}
+%global script_install_path %{script_install_dir}/%{glibc_dso_name}-gdb.py
 
 %global module_install_path %{_datadir}/gdb-heap
 
 # 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 
 # For this to work, we need a matching glibc version:
 Requires: glibc%{_isa} = %{glibc_version}
 
+Requires: gdb
+
+# It is only really usable if that glibc library's debuginfo is available.
 # Strictly speaking, we really require:
 # Requires: glibc-debuginfo%{_isa} = %{glibc_version}
 # but it's debatable if that's a legitimate requirement
+# From version 0.3 onwards the code detects missing debuginfo and provides a
+# suggestion to the user on how to install it
 
 %description
 gdb-heap adds a "heap" command to the gdb debugger, for use in debugging
@@ -58,11 +62,11 @@ dynamic memory allocation problems in user space.
 %install
 rm -rf %{buildroot}
 
-mkdir -p %{buildroot}/%{glibc_debug_dir}
-
 mkdir -p %{buildroot}/%{module_install_path}/heap
 cp -a heap/*.py %{buildroot}/%{module_install_path}/heap
 
+mkdir -p %{buildroot}/%{script_install_dir}
+
 # Build the auto-loaded entrypoint script, adding module_install_path
 # to sys.path:
 echo \
@@ -85,6 +89,16 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug  3 2010 David Malcolm <dmalcolm@redhat.com> - 0.3-1
+- 0.3: detect and warn about missing debuginfo; disable C++ support for
+now (rhbz620930)
+
+* Tue Aug  3 2010 David Malcolm <dmalcolm@redhat.com> - 0.2-2
+- use the gdb autoload directory, relative to the glibc.so, rather than the
+.debug file
+- add requirement on gdb
+- bump glibc version to that in F14
+
 * Thu Jul 29 2010 David Malcolm <dmalcolm@redhat.com> - 0.2-1
 - 0.2
 - install private modules to _datadir rather than _libdir