diff --git a/cfitsio.spec b/cfitsio.spec
index a52bd0c..77a24a6 100644
--- a/cfitsio.spec
+++ b/cfitsio.spec
@@ -1,6 +1,6 @@
 Name:           cfitsio
 Version:        3.030
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Library for manipulating FITS data files
 
 Group:          Development/Libraries
@@ -28,6 +28,7 @@ community.
 Group:  Development/Libraries
 Summary: Headers required when building programs against cfitsio
 Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
 
 %description devel
 Headers required when building a program against the cfitsio library.
@@ -39,6 +40,7 @@ Headers required when building a program against the cfitsio library.
 %build
 FC=f95
 export FC
+export CC=gcc # fixes -O*, -g
 %configure
 make shared %{?_smp_mflags}
 unset FC
@@ -74,6 +76,12 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/cfitsio.pc
 
 %changelog
+* Sat Feb 17 2007 Matthew Truch <matt at truch.net> - 3.030-2
+- Require pkgconfig for -devel.
+- export CC=gcc so we don't clobber $RPM_OPT_FLAGS, thereby
+  ruining any -debuginfo packages.
+  See RedHat Bugzilla 229041.
+
 * Mon Jan 8 2007 Matthew Truch <matt at truch.net> - 3.030-1
 - Upgrade to 3.030 from upstream.