diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html
index 52ca0cf9b4..01ef85086c 100644
--- a/Documentation/NuttxPortingGuide.html
+++ b/Documentation/NuttxPortingGuide.html
@@ -16,7 +16,7 @@
   </b></big></h1>
   <p><small>by</small></p>
   <p>Gregory Nutt</p>
-  <p><small>Last Update: November 26, 2008</small></p>
+  <p><small>Last Update: November 28, 2008</small></p>
 </center>
 
 <center><h1>Table of Contents</h1></center>
@@ -1652,7 +1652,7 @@ The system can be re-made subsequently by just typing <code>make</code>.
   </li>
 </ul>
 
-<h2>SPI-based MMC/SD driver<h2>
+<h2>SPI-based MMC/SD driver</h2>
 <ul>
   <li>
     <code>CONFIG_MMCSD_NSLOTS</code>: Number of MMC/SD slots supported by the driver. Default is one.
@@ -1854,6 +1854,66 @@ The system can be re-made subsequently by just typing <code>make</code>.
   </li>
 </ul>
 
+<h2>Graphics related configuration settings</h3>
+<ul>
+  <li>
+    <code>CONFIG_NXGRAPHICS</code>
+    Enables overall support for graphics library and NX
+  </li>
+</ul>
+
+<h3>NX configuration setting</h3>
+<ul>
+  <li>
+    <code>CONFIG_NX_MULTIUSER</code>
+    Configures NX in multi-user mode
+  </li>
+  <li>
+    <code>CONFIG_NX_NPLANES</code>
+    Some YUV color formats requires support for multiple planes,
+    one for each color component.  Unless you have such special
+    hardware, this value should be undefined or set to 1
+  </li>
+  <li>
+    <code>CONFIG_NXGLIB_DISABLE_1BPP</code>, <code>CONFIG_NXGLIB_DISABLE_2BPP</code>,
+    <code>CONFIG_NXGLIB_DISABLE_4BPP</code>, <code>CONFIG_NXGLIB_DISABLE_8BPP</code>
+    <code>CONFIG_NXGLIB_DISABLE_16BPP</code>, <code>CONFIG_NXGLIB_DISABLE_24BPP</code>, and
+    <code>CONFIG_NXGLIB_DISABLE_32BPP
+    NX supports a variety of pixel depths.  You can save some
+    memory by disabling support for unused color depths.
+  </li>
+  <li>
+    <code>CONFIG_NXGL_PACKEDMSFIRST</code>
+    If a pixel depth of less than 8-bits is used, then NX needs
+    to know if the pixels pack from the MS to LS or from LS to MS
+  </li>
+  <li>
+    <code>CONFIG_NX_MOUSE</code>
+    Build in support for mouse input
+  </li>
+  <li>
+    <code>CONFIG_NX_KBD</code>
+    Build in support of keypad/keyboard input
+  </li>
+</ul>
+
+<h3>NX Multi-user only options</h3>
+<ul>
+  <li>
+    <code>CONFIG_NX_BLOCKING</code>
+    Open the client message queues in blocking mode.  In this case,
+    <code>nx_eventhandler()</code> will never return.
+  </li>
+  <li>
+    <code>CONFIG_NX_MXSERVERMSGS</code> and <code>CONFIG_NX_MXCLIENTMSGS</code>
+    Specifies the maximum number of messages that can fit in
+    the message queues.  No additional resources are allocated, but
+    this can be set to prevent flooding of the client or server with
+    too many messages (<code>CONFIG_PREALLOC_MQ_MSGS</code> controls how many
+    messages are pre-allocated).
+  </li>
+</ul>
+
 <h2>Stack and heap information</h2>
 
 <ul>
diff --git a/TODO b/TODO
index 032778a323..e69cc20e62 100644
--- a/TODO
+++ b/TODO
@@ -350,6 +350,14 @@ o Build system
   Status:      Open
   Priority:    Medium-low
 
+  Description: If CONFIG_NXGRAPHICS is enabled, the build fails the first time
+               saying that there is "No rule to make target..." for one of the
+               auto-generated graphics files.  This is a nuisance, but if you
+               simply build again (with the source files already auto-generated)
+               the problem does not reoccur.
+  Status:      Open
+  Priority:    Low, the work-around is simple
+
 o NuttShell (NSH) (examples/nsh)
   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/configs/README.txt b/configs/README.txt
index ab27e3252a..354245339b 100644
--- a/configs/README.txt
+++ b/configs/README.txt
@@ -368,6 +368,43 @@ defconfig -- This is a configuration file similar to the Linux
 		CONFIG_USBSTRG_REMOVABLE
 		  Select if the media is removable
 
+	Graphics related configuration settings
+
+		CONFIG_NXGRAPHICS
+		  Enables overall support for graphics library and NX
+		CONFIG_NX_MULTIUSER
+		  Configures NX in multi-user mode
+		CONFIG_NX_NPLANES
+		  Some YUV color formats requires support for multiple planes,
+		  one for each color component.  Unless you have such special
+		  hardware, this value should be undefined or set to 1
+		CONFIG_NXGLIB_DISABLE_1BPP, CONFIG_NXGLIB_DISABLE_2BPP,
+		CONFIG_NXGLIB_DISABLE_4BPP, CONFIG_NXGLIB_DISABLE_8BPP,
+		CONFIG_NXGLIB_DISABLE_16BPP, CONFIG_NXGLIB_DISABLE_24BPP, and
+		CONFIG_NXGLIB_DISABLE_32BPP
+		  NX supports a variety of pixel depths.  You can save some
+		  memory by disabling support for unused color depths.
+		CONFIG_NXGL_PACKEDMSFIRST
+		  If a pixel depth of less than 8-bits is used, then NX needs
+		  to know if the pixels pack from the MS to LS or from LS to MS
+		CONFIG_NX_MOUSE
+		  Build in support for mouse input
+		CONFIG_NX_KBD
+		  Build in support of keypad/keyboard input
+
+	NX Multi-user only options:
+
+		CONFIG_NX_BLOCKING
+		  Open the client message queues in blocking mode.  In this case,
+		  nx_eventhandler() will never return.
+		CONFIG_NX_MXSERVERMSGS and CONFIG_NX_MXCLIENTMSGS
+		  Specifies the maximum number of messages that can fit in
+		  the message queues.  No additional resources are allocated, but
+		  this can be set to prevent flooding of the client or server with
+		  too many messages (CONFIG_PREALLOC_MQ_MSGS controls how many
+		  messages are pre-allocated).
+
+
 	Stack and heap information
 
 		CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
diff --git a/graphics/nxglib/Make.defs b/graphics/nxglib/Make.defs
index b93e135cc9..de3bcf6c3e 100644
--- a/graphics/nxglib/Make.defs
+++ b/graphics/nxglib/Make.defs
@@ -35,8 +35,8 @@
 
 NXGLIB_ASRCS	=
 
-#RFILL1_CSRCS	= nxglib_fillrectangle_1bpp.c nxglib_fillrectangle_2bpp.c \
-#		  nxglib_fillrectangle_4bpp.c
+RFILL1_CSRCS	= nxglib_fillrectangle_1bpp.c nxglib_fillrectangle_2bpp.c \
+		  nxglib_fillrectangle_4bpp.c
 RFILL2_CSRCS	= nxglib_fillrectangle_8bpp.c nxglib_fillrectangle_16bpp.c \
 		  nxglib_fillrectangle_24bpp.c nxglib_fillrectangle_32bpp.c
 #TFILL1_CSRCS	= nxglib_filltrapezoid_1bpp.c nxglib_filltrapezoid_2bpp.c \