diff --git a/apr-api-docs.spec b/apr-api-docs.spec
index 4585446..1418ca5 100644
--- a/apr-api-docs.spec
+++ b/apr-api-docs.spec
@@ -1,6 +1,6 @@
 Name:           apr-api-docs
 Version:        1.3.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Apache Portable Runtime API documentation
 
 Group:          Development/Tools
@@ -29,12 +29,12 @@ cp %{SOURCE0} doxygen.conf
 
 %build
 cd %{name}-%{version}
-%define docheaders %(ls %{_includedir}/apr-1/apr.h %{_includedir}/apr-1/apr-%{_arch}.h %{_includedir}/apr-1/apr_*.h %{_includedir}/apr-1/apu*.h | xargs echo)
+%define docheaders %(ls %{_includedir}/apr-1/*.h | xargs echo)
 sed -e 's,\(INPUT *= *\).*$,\1%{docheaders},' \
     -e 's,\(OUTPUT_DIRECTORY *= *\).*$,\1docs,' \
     -e 's,\(GENERATE_TAGFILE *= *\).*$,\1docs/apr.tag,' \
 doxygen.conf | doxygen -
-sed -ie 's,^\[<a class="el" href="group___a_p_r.html">Apache Portability Runtime library</a>\],&'\
+sed -i -e 's,^\[<a class="el" href="group___a_p_r.html">Apache Portability Runtime library</a>\],&'\
 '<br><strong><font color="red">'\
 'WARNING: The actual values of macros and typedefs<br>'\
 'are platform specific and should NOT be relied upon!'\
@@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_docdir}/apr-%{version}/api-docs/*
 
 %changelog
+* Fri Jul 04 2008 Bojan Smojver <bojan@rexursive.com> 1.3.2-2
+- %%{_arch} is set to noarch, cannot use that, include all headers
+
 * Wed Jul 02 2008 Bojan Smojver <bojan@rexursive.com> 1.3.2-1
 - Bump up to 1.3.2