diff --git a/general.ent b/general.ent
index 0e6101c8c7..1695db04d6 100644
--- a/general.ent
+++ b/general.ent
@@ -3,13 +3,13 @@ $LastChangedBy$
 $Date$
 -->
 
-<!ENTITY day          "28">                   <!-- Always 2 digits -->
+<!ENTITY day          "31">                   <!-- Always 2 digits -->
 <!ENTITY month        "10">                   <!-- Always 2 digits -->
 <!ENTITY year         "2010">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "svn-&year;&month;&day;">
-<!ENTITY releasedate  "October &day;th, &year;">
+<!ENTITY releasedate  "October &day;st, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- version|testing|unstable|development] -->
@@ -304,7 +304,7 @@ $Date$
 <!ENTITY jdk-version                  "6 Update 18">
 <!ENTITY junit-version                "4.8.1">
 <!ENTITY librep-version               "0.17">
-<!ENTITY NASM-version                 "2.08">
+<!ENTITY NASM-version                 "2.09">
 <!ENTITY pdl-version                  "2.4.2">
 <!ENTITY php-version                  "5.3.2">
 <!ENTITY Python-version               "2.6.4">
diff --git a/general/prog/nasm.xml b/general/prog/nasm.xml
index 1a69286076..6c802dc416 100644
--- a/general/prog/nasm.xml
+++ b/general/prog/nasm.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY NASM-download-http "http://www.nasm.us/pub/nasm/releasebuilds/&NASM-version;/nasm-&NASM-version;.tar.bz2">
   <!ENTITY NASM-download-ftp  " ">
-  <!ENTITY NASM-md5sum        "aa229cdc849293813bff52502772f73c">
-  <!ENTITY NASM-size          "782 KB">
-  <!ENTITY NASM-buildsize     "24 MB (includes building and installing all docs)">
-  <!ENTITY NASM-time          "0.3 SBU">
+  <!ENTITY NASM-md5sum        "bf224f073b3181186114c93e6695e6ac">
+  <!ENTITY NASM-size          "781 KB">
+  <!ENTITY NASM-buildsize     "25 MB (includes building and installing all docs)">
+  <!ENTITY NASM-time          "0.4 SBU">
 ]>
 
 <sect1 id="NASM" xreflabel="NASM-&NASM-version;">
@@ -33,6 +33,8 @@
     is an 80x86 assembler designed for portability and modularity. It includes a
     disassembler as well.</para>
 
+    &lfs67_built;
+
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -85,17 +87,17 @@ make &amp;&amp;
 make -C rdoff/doc &amp;&amp;
 make -C rdoff/doc html</userinput></screen>
 
-    <para>To build the base <application>NASM</application> and RDOFF PDF
+    <para>To build the base <application>NASM</application>
     documentation, ensure you have <xref linkend="gs"/> installed and
     issue:</para>
 
-<screen><userinput>make doc &amp;&amp;
-make -C rdoff/doc pdf</userinput></screen>
+<screen><userinput>make doc</userinput></screen>
 
-    <para>To build the RDOFF Postscript documentation,
+    <para>To build the RDOFF PDF and Postscript documentation,
     ensure you have <xref linkend="tetex"/> installed and issue:</para>
 
 <screen><userinput>sed -i -e "s/dvips \$&lt;/&amp; -o rdoff.ps/" rdoff/doc/Makefile &amp;&amp;
+make -C rdoff/doc pdf &amp;&amp;
 make -C rdoff/doc ps</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
@@ -127,16 +129,13 @@ pushd /usr/share/info &amp;&amp;
     rm -fv dir        &amp;&amp;
     for FILENAME in *; do install-info $FILENAME dir; done &amp;&amp;
     unset FILENAME &amp;&amp;
-popd                  &amp;&amp;
+popd</userinput></screen>
 
-install -v -m644 rdoff/doc/rdoff.pdf \
-                 /usr/share/doc/nasm-&NASM-version;</userinput></screen>
-
-    <para>Lastly, if you built the RDOFF Postscript documentation, install it
-    using the following command as the
+    <para>Lastly, if you built the RDOFF PDF and Postscript documentation,
+    install it using the following command as the
     <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>install -v -m644 rdoff/doc/rdoff.ps \
+<screen role="root"><userinput>install -v -m644 rdoff/doc/rdoff.p{df,s} \
                  /usr/share/doc/nasm-&NASM-version;</userinput></screen>
 
   </sect2>
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index f53ac652b0..4e270a0f05 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -41,6 +41,16 @@
 
 -->
 
+    <listitem>
+      <para>October 31st, 2010</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Updated to nasm-2.09 (fixes ticket
+          <ulink url="&blfs-ticket-root;3181">#3181</ulink>)</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>October 28th, 2010</para>
       <itemizedlist>