diff --git a/gc-7.0-compat_header.patch b/gc-7.0-compat_header.patch
new file mode 100644
index 0000000..bb4c782
--- /dev/null
+++ b/gc-7.0-compat_header.patch
@@ -0,0 +1,25 @@
+diff -up /dev/null gc-7.0/include/extra/gc.h
+--- /dev/null	2007-08-28 14:44:51.958644302 -0500
++++ gc-7.0/include/extra/gc.h	2007-08-29 10:02:34.000000000 -0500
+@@ -0,0 +1,2 @@
++/* This file is installed for backward compatibility. */
++#include <gc/gc.h>
+diff -up /dev/null gc-7.0/include/extra/gc_cpp.h
+--- /dev/null	2007-08-28 14:44:51.958644302 -0500
++++ gc-7.0/include/extra/gc_cpp.h	2007-08-29 10:02:34.000000000 -0500
+@@ -0,0 +1,2 @@
++/* This file is installed for backward compatibility. */
++#include <gc/gc_cpp.h>
+diff -up gc-7.0/include/include.am.compat_header gc-7.0/include/include.am
+--- gc-7.0/include/include.am.compat_header	2005-10-10 17:33:34.000000000 -0500
++++ gc-7.0/include/include.am	2007-08-29 10:03:21.000000000 -0500
+@@ -52,3 +52,9 @@ dist_noinst_HEADERS += \
+ 	include/cord.h \
+ 	include/ec.h \
+ 	include/javaxfc.h 
++
++# unprefixed header
++include_HEADERS += \
++	include/extra/gc.h \
++	include/extra/gc_cpp.h
++
diff --git a/gc.spec b/gc.spec
index ca2b3b7..0f8d0bf 100644
--- a/gc.spec
+++ b/gc.spec
@@ -3,7 +3,7 @@ Summary: A garbage collector for C and C++
 Name:    gc	
 Version: 7.0 
 
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group:   System Environment/Libraries
 License: BSD
 Url:     http://www.hpl.hp.com/personal/Hans_Boehm/gc/	
@@ -11,9 +11,8 @@ Source0: http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-%{version}.ta
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: gc-7.0-gcinit.patch
-# cflags += %%_includedir/gc
 # http://www.hpl.hp.com/hosted/linux/mail-archives/gc/2007-August/001838.html
-Patch2: gc-7.0-pkgconfig.patch
+Patch2: gc-7.0-compat_header.patch 
 
 # rpmforge compatibility
 Obsoletes: libgc < %{version}-%{release}
@@ -39,7 +38,9 @@ Provides:  libgc-devel = %{version}-%{release}
 %setup -q 
 
 %patch1 -p1 -b .gcinit
-%patch2 -p1 -b .pkgconfig
+%patch2 -p1 -b .compat_header
+
+
 
 
 %build
@@ -91,13 +92,17 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root,-)
 %doc doc/*.html
-%{_includedir}/*
+%{_includedir}/*.h
+%{_includedir}/gc/
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 %{_mandir}/man?/*
 
 
 %changelog
+* Wed Aug 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7.0-5
+- compat_header patch (supercedes previous pkgconfig patch)
+
 * Tue Aug 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7.0-4
 - pkgconfig patch (cflags += -I%%_includedir/gc)