diff --git a/cfitsio.spec b/cfitsio.spec
index 1b14d00..dccb9a6 100644
--- a/cfitsio.spec
+++ b/cfitsio.spec
@@ -1,6 +1,6 @@
 Name:           cfitsio
 Version:        3.004
-Release:        0.8.b
+Release:        0.9.b
 Summary:        Library for manipulating FITS data files
 
 Group:          Development/Libraries
@@ -51,13 +51,18 @@ unset FC
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}
+CFITSIO_LIB = %{buildroot}%{_libdir}
+CFITSIO_INCLUDE = %{buildroot}%{_includedir}/%{name}
+export CFITSIO_LIB
+export CFITSIO_INCLUDE
 make install
 #move headers to correct location (configure doesn't obey --includedir)
-mkdir -p %{buildroot}%{_includedir}/%{name}
-mv %{buildroot}%{_includedir}/*.h %{buildroot}%{_includedir}/%{name}
+mkdir -p %{buildroot}%{_libdir}
 pushd %{buildroot}%{_libdir}
 ln -s libcfitsio.so libcfitsio.so.0
 popd
+unset CFITSIO_LIB
+unset CFITSIO_INCLUDE
 
 %clean
 rm -rf %{buildroot}
@@ -76,6 +81,9 @@ rm -rf %{buildroot}
 %{_libdir}/libcfitsio.a
 
 %changelog
+* Sat Nov 12 2005 Matthew Truch <matt at truch.net> - 3.004-0.9.b
+- Set libdir and includedir correctly for build process.
+
 * Sat Nov 12 2005 Matthew Truch <matt at truch.net> - 3.004-0.8.b
 - unset FC once we are done with the build