diff --git a/nasm.changes b/nasm.changes
index 6d6f05e..fd1dd07 100644
--- a/nasm.changes
+++ b/nasm.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Dec 17 10:50:19 CET 2010 - pgajdos@suse.cz
+
+- don't include pdf in documentation, remove ghostscript from
+  build requires to break dependency cycle (jpeg-turbo needs
+  nasm for build)
+
 -------------------------------------------------------------------
 Mon Aug 30 22:49:25 UTC 2010 - cristian.rodriguez@opensuse.org
 
diff --git a/nasm.spec b/nasm.spec
index ac36b1a..e0ae314 100644
--- a/nasm.spec
+++ b/nasm.spec
@@ -19,7 +19,6 @@
 
 
 Name:           nasm
-BuildRequires:  ghostscript_any
 Url:            http://nasm.sourceforge.net/
 License:        BSD 2-clause
 Group:          Development/Languages/Other
@@ -112,22 +111,26 @@ touch -r ./ver.c ./ver.c.stamp
 sed -i -e s@__DATE__@__TIMESTAMP__@ ./ver.c
 touch -r ./ver.c.stamp ./ver.c
 %configure
-make %{?jobs:-j%jobs} all doc
+make all
+cd doc
+make html info nasmdoc.ps nasmdoc.txt
 
 %install
 install -d -m 755 $RPM_BUILD_ROOT/usr/bin
 install -d -m 755 $RPM_BUILD_ROOT/%{_mandir}/man1
 install -d -m 755 $RPM_BUILD_ROOT/%{_docdir}/nasm
 install -d -m 755 $RPM_BUILD_ROOT/%{_docdir}/nasm/rdoff
+install -d -m 755 $RPM_BUILD_ROOT/%{_docdir}/nasm/html
 install -d -m 755 $RPM_BUILD_ROOT/%{_infodir}
-make INSTALLROOT=$RPM_BUILD_ROOT install_everything docdir=%{_docdir}/nasm
-make INSTALLROOT=$RPM_BUILD_ROOT install_doc docdir=%{_docdir}/nasm
-install -m 644 AUTHORS CHANGES ChangeLog LICENSE INSTALL TODO README \
+make INSTALLROOT=$RPM_BUILD_ROOT install
+make INSTALLROOT=$RPM_BUILD_ROOT rdf_install
+install -m 644 AUTHORS CHANGES ChangeLog LICENSE TODO README doc/*.txt \
 	$RPM_BUILD_ROOT/%{_docdir}/nasm
 install -m 644 rdoff/README rdoff/doc/* \
 	$RPM_BUILD_ROOT/%{_docdir}/nasm/rdoff
-rm -f $RPM_BUILD_ROOT/%_docdir/nasm/*.ps
-rm -f %buildroot%{_docdir}/nasm/INSTALL
+install -m 644 doc/html/* $RPM_BUILD_ROOT%{_docdir}/nasm/html
+install -m 644 ndisasm.1 nasm.1 rdoff/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
+install -m 644 doc/info/* $RPM_BUILD_ROOT%{_infodir}
 
 %clean
 [ "$RPM_BUILD_ROOT" != "/" -a -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;