diff --git a/cfitsio.spec b/cfitsio.spec
index c2388e7..0c5d3b4 100644
--- a/cfitsio.spec
+++ b/cfitsio.spec
@@ -1,6 +1,6 @@
 Name:           cfitsio
 Version:        3.130
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Library for manipulating FITS data files
 
 Group:          Development/Libraries
@@ -40,6 +40,14 @@ Summary: Static cfitsio library
 %description static
 Static cfitsio library; avoid use if possible.
 
+%package docs
+Summary: Documentation for cfitsio
+Group:  Development/Libraries
+BuildArch:  noarch
+
+%description docs
+Stand-alone documentation for cfitsio.
+
 %prep
 %setup -q -n cfitsio
 %patch -p1
@@ -85,7 +93,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc README License.txt changes.txt fitsio.doc fitsio.ps cfitsio.doc cfitsio.ps
+%doc README License.txt changes.txt
 %{_libdir}/libcfitsio.so.*
 
 %files devel
@@ -95,9 +103,18 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/cfitsio.pc
 
 %files static
+%defattr(-,root,root,-)
 %{_libdir}/libcfitsio.a
 
+%files docs
+%defattr(-,root,root,-)
+%doc fitsio.doc fitsio.ps cfitsio.doc cfitsio.ps
+
 %changelog
+* Wed Jun 17 2009 Matthew Truch <matt at truch.net> - 3.130-5
+- Separate -docs noarch subpackage as per BZ 492438.
+- Explicitly set file attributes correctly.  
+
 * Tue Mar 10 2009 Matthew Truch <matt at truch.net> - 3.130-4
 - Set correct version in pkgconfig .pc file.