diff --git a/.cvsignore b/.cvsignore
index 78eee39..6090ddb 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-nasm-0.98.tar.gz
+nasm-0.98.22.tar.bz2
diff --git a/nasm.spec b/nasm.spec
index fd738bd..0f08391 100644
--- a/nasm.spec
+++ b/nasm.spec
@@ -1,12 +1,12 @@
 Summary: A portable x86 assembler which uses Intel-like syntax.
 Name: nasm
-Version: 0.98
-Release: 8
+Version: 0.98.22
+Release: 2
 Patch0: nasm-0.98-boguself2.patch
 License: freely distributable
 Group: Development/Languages
-Source: ftp://ftp.us.kernel.org/pub/software/devel/nasm/source/nasm-%{version}.tar.gz
-URL: http://www.cryogen.com/Nasm/
+Source: ftp://ftp.us.kernel.org/pub/software/devel/nasm/source/nasm-%{version}.tar.bz2
+URL: http://nasm.2y.net/
 BuildRequires: perl
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: /sbin/install-info
@@ -41,12 +41,12 @@ include linker, library manager, loader, and information dump.
 %build
 
 %configure
-make everything
+make everything CFLAGS="$RPM_OPT_FLAGS -I. -I`pwd` -ansi -pedantic -Wall"
 
 %install
 rm -fr $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/bin
+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
@@ -71,8 +71,8 @@ fi
 %files
 %defattr(-,root,root)
 %doc COPYING Changes Licence MODIFIED Readme Wishlist
-/usr/bin/nasm
-/usr/bin/ndisasm
+%{_bindir}/nasm
+%{_bindir}/ndisasm
 %{_mandir}/*/*
 %{_infodir}/nasm.info*.gz
 
@@ -82,14 +82,24 @@ fi
 
 %files rdoff
 %defattr(-,root,root)
-/usr/bin/ldrdf
-/usr/bin/rdf2bin
-/usr/bin/rdf2com
-/usr/bin/rdfdump
-/usr/bin/rdflib
-/usr/bin/rdx
+%{_bindir}/ldrdf
+%{_bindir}/rdf2bin
+%{_bindir}/rdf2com
+%{_bindir}/rdfdump
+%{_bindir}/rdflib
+%{_bindir}/rdx
 
 %changelog
+* Tue Feb 26 2002 Trond Eivind Glomsrød <teg@redhat.com> 0.98.22-2
+- Rebuild
+
+* Mon Jan 21 2002 Bernhard Rosenkraenzer <bero@redhat.com>
+- Update to 0.98.22 to fix bogus code generation in SDL
+- Fix spec file, handle RPM_OPT_FLAGS
+
+* Wed Jan 09 2002 Tim Powers <timp@redhat.com>
+- automated rebuild
+
 * Tue Aug  7 2001 Trond Eivind Glomsrød <teg@redhat.com>
 - Updated patch from H.J. Lu for bogus elf generation (#45986, 
   verified by reporter) 
diff --git a/sources b/sources
index 4274e1c..30853ac 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fc334b4b05b5f57fe3fc867c42320ef9  nasm-0.98.tar.gz
+d59e148f46a4a700936d360fc8b65a4e  nasm-0.98.22.tar.bz2