diff -u syslinux-3.63+dfsg/debian/changelog syslinux-3.63+dfsg/debian/changelog
--- syslinux-3.63+dfsg/debian/changelog
+++ syslinux-3.63+dfsg/debian/changelog
@@ -1,3 +1,9 @@
+syslinux (2:3.63+dfsg-2ubuntu3.1) UNRELEASED; urgency=low
+
+  * 15-ubuntu_nasm_2.09.dpatch: Fix build with nasm >= 2.09.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Sat, 24 Mar 2012 01:23:30 +0000
+
 syslinux (2:3.63+dfsg-2ubuntu3) intrepid; urgency=low
 
   * Drop mtools back to Recommends now that recommended packages are
diff -u syslinux-3.63+dfsg/debian/patches/00list syslinux-3.63+dfsg/debian/patches/00list
--- syslinux-3.63+dfsg/debian/patches/00list
+++ syslinux-3.63+dfsg/debian/patches/00list
@@ -8,0 +9 @@
+15-ubuntu_nasm_2.09.dpatch
only in patch2:
unchanged:
--- syslinux-3.63+dfsg.orig/debian/patches/15-ubuntu_nasm_2.09.dpatch
+++ syslinux-3.63+dfsg/debian/patches/15-ubuntu_nasm_2.09.dpatch
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 15-ubuntu_nasm_0.9.dpatch by Colin Watson <cjwatson@ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Build with nasm >= 2.09.
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' syslinux-3.63+dfsg~/layout.inc syslinux-3.63+dfsg/layout.inc
+--- syslinux-3.63+dfsg~/layout.inc	2012-03-24 01:22:32.000000000 +0000
++++ syslinux-3.63+dfsg/layout.inc	2012-03-24 01:22:39.000000000 +0000
+@@ -42,6 +42,8 @@
+ ;
+ 		org TEXT_START
+ 
++		sectalign off
++
+ 		; Use .earlybss for things that MUST be in low memory.
+ 		section .earlybss	nobits start=BSS_START
+ 		section .bcopy32	align=4 valign=16 follows=.data vfollows=.earlybss
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' syslinux-3.63+dfsg~/memdisk/memset.S syslinux-3.63+dfsg/memdisk/memset.S
+--- syslinux-3.63+dfsg~/memdisk/memset.S	2008-04-10 18:30:35.000000000 +0100
++++ syslinux-3.63+dfsg/memdisk/memset.S	2012-03-24 01:22:48.000000000 +0000
+@@ -26,4 +26,4 @@
+ 	popl %edi
+ 	ret
+ 
+-	.size memcpy,.-memcpy
++	.size memset,.-memset