diff --git a/nasm.spec b/nasm.spec
index 970c92b..af27faa 100644
--- a/nasm.spec
+++ b/nasm.spec
@@ -1,26 +1,22 @@
-# -*- coding: utf-8 -*-
 Summary: A portable x86 assembler which uses Intel-like syntax
 Name: nasm
 Version: 2.10.07
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
-Group: Development/Languages
 URL: http://www.nasm.us
 Source0: http://www.nasm.us/pub/nasm/releasebuilds/%{version}/%{name}-%{version}.tar.bz2
 Source1: http://www.nasm.us/pub/nasm/releasebuilds/%{version}/%{name}-%{version}-xdoc.tar.bz2
 BuildRequires: perl
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
 %package doc
 Summary: Documentation for NASM
-Group: Development/Languages
 BuildRequires: ghostscript, texinfo
+BuildArch: noarch
 
 %package rdoff
 Summary: Tools for the RDOFF binary format, sometimes used with NASM
-Group: Development/Tools
 
 %description
 NASM is the Netwide Assembler, a free portable assembler for the Intel
@@ -46,16 +42,12 @@ make everything %{?_smp_mflags}
 gzip -9f doc/nasmdoc.{ps,txt}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
 make INSTALLROOT=$RPM_BUILD_ROOT install install_rdf
 install -d $RPM_BUILD_ROOT/%{_infodir}
 install -t $RPM_BUILD_ROOT/%{_infodir} doc/info/*
 
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
 %post
 if [ -e %{_infodir}/nasm.info.gz ]; then
   /sbin/install-info %{_infodir}/nasm.info.gz  %{_infodir}/dir || :
@@ -67,7 +59,6 @@ if [ $1 = 0 -a -e %{_infodir}/nasm.info.gz ]; then
 fi
 
 %files
-%defattr(-,root,root)
 %doc AUTHORS CHANGES README TODO
 %{_bindir}/nasm
 %{_bindir}/ndisasm
@@ -75,11 +66,9 @@ fi
 %{_infodir}/nasm.info*.gz
 
 %files doc
-%defattr(-,root,root)
 %doc doc/html doc/nasmdoc.txt.gz doc/nasmdoc.ps.gz
 
 %files rdoff
-%defattr(-,root,root)
 %{_bindir}/ldrdf
 %{_bindir}/rdf2bin
 %{_bindir}/rdf2ihx
@@ -91,6 +80,10 @@ fi
 %{_bindir}/rdf2srec
 
 %changelog
+* Thu Mar  7 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.10.07-2
+- Update to current packaging guidelines
+- Resolves: rhbz#919008 (doc subpackage should be noarch)
+
 * Wed Jan 30 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.10.07-1
 - Update to upstream version 2.10.07