diff --git a/blitz.spec b/blitz.spec
index 884a30c..4f0bc08 100644
--- a/blitz.spec
+++ b/blitz.spec
@@ -1,6 +1,6 @@
 Name: blitz
 Version: 0.9
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: C++ class library for matrix scientific computing
 
 Group: Development/Libraries
@@ -33,6 +33,8 @@ application
 %package doc
 Summary: The Blitz html docs
 Group: Documentation
+BuildArch: noarch
+
 %description doc
 HTML documentation files for the Blitz Library
 
@@ -43,31 +45,31 @@ HTML documentation files for the Blitz Library
 %build
 %configure --enable-shared --disable-static --disable-fortran \
     --disable-dependency-tracking --disable-cxx-flags-preset
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 # blitz.pc is created directly by configure
 # I use sed to add %%libdir/blitz to the include directories of the library
 # so that different bzconfig.h can be installed for different archs
 %{__sed} -i -e "s/Cflags: -I\${includedir}/Cflags: -I\${includedir} -I\${libdir}\/blitz\/include/" blitz.pc
 
 %install
-%{__rm} -fr %{buildroot}
-%{__make} DESTDIR=%{buildroot} install
-%{__mkdir_p} %{buildroot}%{_libdir}/blitz/include/blitz
-%{__mv} %{buildroot}%{_includedir}/blitz/gnu %{buildroot}%{_libdir}/blitz/include/blitz
-%{__rm} -rf doc/doxygen/html/installdox
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
+mkdir -p %{buildroot}%{_libdir}/blitz/include/blitz
+mv %{buildroot}%{_includedir}/blitz/gnu %{buildroot}%{_libdir}/blitz/include/blitz
+rm -rf doc/doxygen/html/installdox
 # There are some empty files in doc, remove before copying in doc
 (find -empty | xargs rm)
 # Put in doc only the source code
-%{__rm} -rf examples/.deps
-%{__rm} -rf examples/Makefile*
+rm -rf examples/.deps
+rm -rf examples/Makefile*
 
 # Check fails with gcc 4.3 and ppc
 # Removed for the moment
 #%check
-#%{__make} %{?_smp_mflags} check-testsuite
+#make %{?_smp_mflags} check-testsuite
 
 %clean
-%{__rm} -fr %{buildroot}
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -106,6 +108,9 @@ fi
 
 
 %changelog
+* Sun Jul 26 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 0.9-12
+- Noarch doc subpackage
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild