diff --git a/cfitsio.spec b/cfitsio.spec
index 7f1802a..fd55978 100644
--- a/cfitsio.spec
+++ b/cfitsio.spec
@@ -1,6 +1,6 @@
 Name:           cfitsio
 Version:        3.006
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Library for manipulating FITS data files
 
 Group:          Development/Libraries
@@ -39,14 +39,14 @@ Headers required when building a program against the cfitsio library.
 %build
 FC=f95
 export FC
-%configure --prefix=%{buildroot}/%{_prefix} --includedir=%{buildroot}/%{_includedir}/%{name}
+%configure
 make shared %{?_smp_mflags}
 unset FC
 
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}
-LIBDIR=%{_lib} INCLUDEDIR=include/%{name} make install
+make LIBDIR=%{_lib} INCLUDEDIR=include/%{name} CFITSIO_PREFIX=%{buildroot}%{_prefix} install
 pushd %{buildroot}%{_libdir}
 ln -s libcfitsio.so.0 libcfitsio.so
 popd
@@ -69,6 +69,10 @@ rm -rf %{buildroot}
 %{_libdir}/libcfitsio.so
 
 %changelog
+* Sun Mar 19 2006 Matthew Truch <matt at truch.net> - 3.006-4
+- Don't use %{buildroot} in %build, only in %_install as per 
+  appended comments to Bugzilla bug 172042
+  
 * Fri Mar 10 2006 Matthew Truch <matt at truch.net> - 3.006-3
 - Point to f95 instead of g95 as per bugzilla bug 185107