diff --git a/nasm-fix-crash.diff b/nasm-fix-crash.diff
new file mode 100644
index 0000000..6165b48
--- /dev/null
+++ b/nasm-fix-crash.diff
@@ -0,0 +1,11 @@
+--- preproc.c	2008-02-19 20:08:57.000000000 +0100
++++ preproc.c	2008-04-15 08:51:51.526780000 +0200
+@@ -1074,7 +1074,7 @@
+         }
+ 
+         for (r = p, s = ourcopy; *r; r++) {
+-	    if (r > p+MAX_KEYWORD)
++	    if (r >= p+MAX_KEYWORD)
+ 		return tokval->t_type = TOKEN_ID; /* Not a keyword */
+             *s++ = tolower(*r);
+ 	}
diff --git a/nasm.changes b/nasm.changes
index 20f8047..631cf78 100644
--- a/nasm.changes
+++ b/nasm.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Apr 15 08:59:00 CEST 2008 - coolo@suse.de
+
+- fix crash in syslinux
+
 -------------------------------------------------------------------
 Mon Apr  7 16:44:14 CEST 2008 - pth@suse.de
 
diff --git a/nasm.spec b/nasm.spec
index e820e85..6f17712 100644
--- a/nasm.spec
+++ b/nasm.spec
@@ -18,11 +18,12 @@ License:        LGPL v2.1 or later
 Group:          Development/Languages/Other
 AutoReqProv:    on
 Version:        2.02
-Release:        1
+Release:        3
 Summary:        Netwide Assembler (An x86 Assembler)
 Source:         nasm-%version.tar.bz2
 Patch0:         nasm-array_too_small.patch
 Patch1:         nasm-codecleanup.patch
+Patch2:         nasm-fix-crash.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -64,6 +65,7 @@ Authors:
 %setup -q
 %patch
 %patch1
+%patch2
 
 %package doc
 License:        LGPL v2.1 or later
@@ -143,6 +145,8 @@ rm -f $RPM_BUILD_ROOT/%_docdir/nasm/*.ps
 %doc %{_infodir}/nasm*
 
 %changelog
+* Tue Apr 15 2008 coolo@suse.de
+- fix crash in syslinux
 * Mon Apr 07 2008 pth@suse.de
 - Update to 2.02:
   * Additional fixes for MMX operands with explicit "qword", as well as