diff --git a/TODO b/TODO
index 84ee69a066..2a592d41b2 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-NuttX TODO List (Last updated January 3, 2016)
+NuttX TODO List (Last updated January 11, 2016)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 This file summarizes known NuttX bugs, limitations, inconsistencies with
@@ -24,7 +24,7 @@ nuttx/
  (11)  File system/Generic drivers (fs/, drivers/)
   (8)  Graphics subsystem (graphics/)
   (1)  Pascal add-on (pcode/)
-  (2)  Build system / Toolchains
+  (1)  Build system / Toolchains
   (3)  Linux/Cywgin simulation (arch/sim)
   (5)  ARM (arch/arm/)
 
@@ -1586,16 +1586,6 @@ o Pascal Add-On (pcode/)
 o Build system
   ^^^^^^^^^^^^
 
-  Title:       WINDOWS DEPENDENCY GENERATION
-  Description: Dependency generation is currently disabled when a Windows native
-               toolchain is used in a POSIX-like environment (like Cygwin).  The
-               issue is that the Windows tool generates dependencies use Windows
-               path formatting and this fails with the dependency file (Make.dep)
-               is include).  Perhaps the only issue is that all of the Windows
-               dependencies needed to be quoted in the Make.dep files.
-  Status:      Open
-  Priority:    Low -- unless some dependency-related build issues is discovered.
-
   Title:       MAKE EXPORT LIMITATIONS
   Description: The top-level Makefile 'export' target that will bundle up all of the
                NuttX libraries, header files, and the startup object into an export-able
diff --git a/arch b/arch
index 1a314699cf..ad4ca80846 160000
--- a/arch
+++ b/arch
@@ -1 +1 @@
-Subproject commit 1a314699cf004cd85dae0038b566bab3343d294f
+Subproject commit ad4ca8084676b719edc4b16ad24f37d2b1aec7b1
diff --git a/configs b/configs
index 097e95b685..5eb7ce1631 160000
--- a/configs
+++ b/configs
@@ -1 +1 @@
-Subproject commit 097e95b68591dbbb53cba593a041e830f051c758
+Subproject commit 5eb7ce16316971813ced45e4869167ec55a72b45
diff --git a/tools/cnvwindeps.c b/tools/cnvwindeps.c
index 7c13b314d4..df4fe7b586 100644
--- a/tools/cnvwindeps.c
+++ b/tools/cnvwindeps.c
@@ -99,6 +99,15 @@ static char *find_spaces(char *ptr)
   return ptr;
 }
 
+static bool scour_path(const char *path)
+{
+  /* KLUDGE: GNU make cannot handle dependencies with spaces in them.
+   * There may be addition characters that cause problems too.
+   */
+
+  return strchr(path, ' ') != NULL;
+}
+
 static bool dequote_path(const char *winpath)
 {
   char *dest = g_dequoted;
@@ -175,6 +184,7 @@ int main(int argc, char **argv, char **envp)
   FILE *stream;
   bool begin;
   bool quoted;
+  bool scouring;
 
   if (argc != 2)
     {
@@ -189,7 +199,8 @@ int main(int argc, char **argv, char **envp)
       exit(EXIT_FAILURE);
     }
 
-  begin = true;
+  begin    = true;
+  scouring = false;
   g_lineno = 0;
 
   while (fgets(g_line, MAX_LINE, stream) != NULL)
@@ -214,15 +225,19 @@ int main(int argc, char **argv, char **envp)
                   *next++ = '\0';
                 }
 
-              quoted = convert_path(path);
-              if (quoted)
+              scouring = scour_path(path);
+              if (!scouring)
                 {
-                  printf("\"%s\":", g_posix);
-                }
-              else
-                {
-                  printf("%s:", g_posix);
-                }
+                  quoted = convert_path(path);
+                  if (quoted)
+                    {
+                      printf("\"%s\":", g_posix);
+                    }
+                  else
+                    {
+                      printf("%s:", g_posix);
+                    }
+               }
 
               begin = false;
             }
@@ -238,7 +253,8 @@ int main(int argc, char **argv, char **envp)
               else if (strcmp(path, "") == 0)
                 {
                   printf("\n\n");
-                  begin = true;
+                  begin    = true;
+                  scouring = false;
                   break;
                 }
               else
@@ -248,15 +264,18 @@ int main(int argc, char **argv, char **envp)
                       *next++ = '\0';
                     }
 
-                  quoted = convert_path(path);
-                  if (quoted)
+                  if (!scouring && !scour_path(path))
                     {
-                      printf(" \\\n\t\"%s\"", g_posix);
-                    }
-                  else
-                    {
-                      printf(" \\\n\t%s", g_posix);
-                    }
+                      quoted = convert_path(path);
+                      if (quoted)
+                        {
+                          printf(" \\\n\t\"%s\"", g_posix);
+                        }
+                      else
+                        {
+                          printf(" \\\n\t%s", g_posix);
+                        }
+                  }
                 }
             }
         }