diff --git a/ChangeLog b/ChangeLog
index 777ed8b1287..f8651c1112d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -609,4 +609,5 @@
 	* Updated all ARM Make.def files to work with gcc 2.4.2 (However, there are
 	  still some build issues associated with that toolchain in use of arm-elf-objcopy
 	  -- see the TODO.txt list for details)
+	* Fix problems with Z16F compilation introduced with recent changes.
 
diff --git a/Documentation/NuttX.html b/Documentation/NuttX.html
index 3a465989e38..d19308721bd 100644
--- a/Documentation/NuttX.html
+++ b/Documentation/NuttX.html
@@ -8,7 +8,7 @@
   <tr align="center" bgcolor="#e4e4e4">
     <td>
       <h1><big><font color="#3c34ec"><i>NuttX RTOS</i></font></big></h1>
-      <p>Last Updated: January 6, 2009</p>
+      <p>Last Updated: February 6, 2009</p>
     </td>
   </tr>
 </table>
@@ -1105,7 +1105,7 @@ m68k, m68hc11, m68hc12, and SuperH ports.</blockquote>
       </p>
     </ul>
     <p>
-      At present, on the Zilog Z16F port uses a native Windows toolchain
+      At present, only the Zilog Z16F, z8Encore, and ez80Acclaim ports use a native Windows toolchain
       (the Zilog ZDS-II toolchain).
     </p.
   </td>
@@ -1297,6 +1297,7 @@ nuttx-0.4.1 2008-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
 	* Updated all ARM Make.def files to work with gcc 2.4.2 (However, there are
 	  still some build issues associated with that toolchain in use of arm-elf-objcopy
 	  -- see the TODO.txt list for details)
+	* Fix problems with Z16F compilation introduced with recent changes.
 
 pascal-0.1.3 2008-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
 
diff --git a/arch/z16/src/Makefile b/arch/z16/src/Makefile
index b45fad8b02e..229ca14dc55 100644
--- a/arch/z16/src/Makefile
+++ b/arch/z16/src/Makefile
@@ -39,7 +39,7 @@
 COMPILER	= ${shell basename $(CC)}
 ARCHSRCDIR	= $(TOPDIR)/arch/$(CONFIG_ARCH)/src
 ifeq ($(COMPILER),zneocc.exe)
-WARCHSRCDIR	= ${shell cygpath -w $(ARCHSRCDIR)}
+WARCHSRCDIR	:= ${shell cygpath -w $(ARCHSRCDIR)}
 USRINCLUDES	= -usrinc:'.;$(WTOPDIR)\sched;$(WARCHSRCDIR);$(WARCHSRCDIR)\common'
 else
 WARCHSRCDIR	= $(ARCHSRCDIR)
@@ -85,11 +85,7 @@ $(OBJS) $(HEAD_AOBJ): %$(OBJEXT): %.S
 endif
 
 $(COBJS): %$(OBJEXT): %.c
-ifeq ($(COMPILER),zneocc.exe)
-	$(call COMPILE, `cygpath -w $<`, $@)
-else
 	$(call COMPILE, $<, $@)
-endif
 
 libarch$(LIBEXT): $(OBJS)
 	@( for obj in $(OBJS) ; do \
diff --git a/configs/z16f2800100zcog/pashello/Make.defs b/configs/z16f2800100zcog/pashello/Make.defs
index c053a26507e..dd59792767c 100755
--- a/configs/z16f2800100zcog/pashello/Make.defs
+++ b/configs/z16f2800100zcog/pashello/Make.defs
@@ -137,7 +137,7 @@ endef
 define COMPILE
 	@#echo "CC: $1"
 	@(wfile=`cygpath -w $1`; $(CC) $(CFLAGS) $$wfile)
-eendef
+endef
 
 define ASSEMBLE
 	@#echo "AS: $1"
diff --git a/drivers/mmcsd/mmcsd_spi.c b/drivers/mmcsd/mmcsd_spi.c
index 98fc375dfdd..7501928d010 100644
--- a/drivers/mmcsd/mmcsd_spi.c
+++ b/drivers/mmcsd/mmcsd_spi.c
@@ -62,7 +62,9 @@
 /* Configuration ************************************************************/
 
 #ifndef CONFIG_MMCSD_NSLOTS
-#  warning "CONFIG_MMCSD_NSLOTS not defined"
+#  ifdef CONFIG_CPP_HAVE_WARNING
+#    warning "CONFIG_MMCSD_NSLOTS not defined"
+#  endif
 #  define CONFIG_MMCSD_NSLOTS 1
 #endif
 
@@ -1098,7 +1100,7 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
 {
   FAR struct spi_dev_s *spi = slot->spi;
   ubyte csd[16];
-  uint32 result;
+  uint32 result = MMCSD_SPIR1_IDLESTATE;
   int i, j;
 
   /* Assume that the card is not ready (we'll clear this on successful car