diff --git a/.cvsignore b/.cvsignore
index ae434c9..334f89f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,4 @@
 nasm-0.98.38.tar.bz2
 nasm-0.98.39.tar.bz2
+nasm-2.01.tar.bz2
+nasm-2.01-xdoc.tar.bz2
diff --git a/nasm-0.98-boguself2.patch b/nasm-0.98-boguself2.patch
deleted file mode 100644
index d21f321..0000000
--- a/nasm-0.98-boguself2.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- nasm-0.98.39/output/outelf.c.boguself	Sun May 20 01:25:35 2001
-+++ nasm-0.98.39/output/outelf.c	Sun May 20 02:01:59 2001
-@@ -548,7 +548,7 @@ static void elf_add_reloc (struct Sectio
-         r->symbol = 0;
-         for (i = 0; i < nsects; i++)
-             if (segment == sects[i]->index)
--                r->symbol = i + 3;
-+                r->symbol = i + 2;
-         if (!r->symbol)
-             r->symbol = GLOBAL_TEMP_BASE + raa_read(bsym, segment);
-     }
-@@ -922,13 +922,13 @@ static struct SAA *elf_build_symtab (lon
-      * Now some standard symbols defining the segments, for relocation
-      * purposes.
-      */
--    for (i = 1; i <= nsects + 1; i++) {
-+    for (i = 1; i <= nsects; i++) {
-         p = entry;
-         WRITELONG(p, 0);        /* no symbol name */
-         WRITELONG(p, 0);        /* offset zero */
-         WRITELONG(p, 0);        /* size zero */
-         WRITESHORT(p, 3);       /* local section-type thing */
--        WRITESHORT(p, (i == 1 ? SHN_ABS : i - 1));      /* the section id */
-+        WRITESHORT (p, i);             /* the section id */
-         saa_wbytes(s, entry, 16L);
-         *len += 16;
-         (*local)++;
-@@ -986,7 +986,7 @@ static struct SAA *elf_build_reltab (lon
-         long sym = r->symbol;
- 
-         if (sym >= GLOBAL_TEMP_BASE)
--            sym += -GLOBAL_TEMP_BASE + (nsects + 3) + nlocals;
-+            sym += -GLOBAL_TEMP_BASE + (nsects + 2) + nlocals;
- 
-         p = entry;
-         WRITELONG(p, r->address);
diff --git a/nasm-0.98.39-overfl.patch b/nasm-0.98.39-overfl.patch
deleted file mode 100644
index a19fbab..0000000
--- a/nasm-0.98.39-overfl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- nasm-0.98.39/output/outieee.c.overfl	2005-01-15 23:16:08.000000000 +0100
-+++ nasm-0.98.39/output/outieee.c	2005-04-01 12:55:17.231530832 +0200
-@@ -1120,7 +1120,7 @@ static void ieee_putascii(char *format, 
-     va_list ap;
- 
-     va_start(ap, format);
--    vsprintf(buffer, format, ap);
-+    vsnprintf(buffer, sizeof(buffer), format, ap);
-     l = strlen(buffer);
-     for (i = 0; i < l; i++)
-         if ((buffer[i] & 0xff) > 31)
diff --git a/nasm.spec b/nasm.spec
index c26522c..508312a 100644
--- a/nasm.spec
+++ b/nasm.spec
@@ -1,14 +1,13 @@
 # -*- coding: utf-8 -*-
 Summary: A portable x86 assembler which uses Intel-like syntax
 Name: nasm
-Version: 0.98.39
-Release: 5%{?dist}
+Version: 2.01
+Release: 1%{?dist}
 License: LGPL
 Group: Development/Languages
 URL: http://nasm.sourceforge.net/
-Source: nasm-%{version}.tar.bz2
-Patch0: nasm-0.98-boguself2.patch
-Patch1: nasm-0.98.39-overfl.patch
+Source0: nasm-%{version}.tar.bz2
+Source1: nasm-%{version}-xdoc.tar.bz2
 BuildRequires: perl
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info
@@ -39,25 +38,20 @@ include linker, library manager, loader, and information dump.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
+tar xjf %{SOURCE1} --strip-components 1
 
 %build
 %configure
-make everything CFLAGS="$RPM_OPT_FLAGS -I. -I`pwd` -ansi -pedantic"
+make everything
+gzip -9f doc/nasmdoc.{ps,txt}
 
 %install
-rm -fr $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
-mkdir -p $RPM_BUILD_ROOT/%{_infodir}
-mkdir -p $RPM_BUILD_ROOT/usr/tempdoc
-%makeinstall install_everything docdir=$RPM_BUILD_ROOT/usr/tempdoc
-cp -a $RPM_BUILD_ROOT/usr/tempdoc/html $RPM_BUILD_ROOT/usr/tempdoc/nasmdoc.{ps,txt,pdf} .
-gzip -9f nasmdoc.{ps,txt}
-# remove unpackaged files from the buildroot
-rm -rf $RPM_BUILD_ROOT%{_prefix}/tempdoc
-rm -f $RPM_BUILD_ROOT%{_bindir}/rdf2ihx
+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}
@@ -80,18 +74,22 @@ fi
 
 %files doc
 %defattr(-,root,root)
-%doc html nasmdoc.txt.gz nasmdoc.ps.gz
+%doc doc/html doc/nasmdoc.txt.gz doc/nasmdoc.ps.gz
 
 %files rdoff
 %defattr(-,root,root)
 %{_bindir}/ldrdf
 %{_bindir}/rdf2bin
+%{_bindir}/rdf2ihx
 %{_bindir}/rdf2com
 %{_bindir}/rdfdump
 %{_bindir}/rdflib
 %{_bindir}/rdx
 
 %changelog
+* Tue Jan 29 2008 Petr Machata <pmachata@redhat.com> - 2.01-1
+- rebase to a new stable upstream version 2.01
+
 * Wed Feb  7 2007 Petr Machata <pmachata@redhat.com> - 0.98.39-5
 - tidy up the specfile per rpmlint comments
 - use utf-8 and fix national characters in contributor's names
diff --git a/sources b/sources
index 4a6bff7..a76e560 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-2032ad44c7359f7a9a166a40a633e772  nasm-0.98.39.tar.bz2
+93384e87a452607c8d4ce533939295bd  nasm-2.01.tar.bz2
+9cbbe96be3ab546d12e82d2bc1491326  nasm-2.01-xdoc.tar.bz2