diff --git a/ChangeLog.txt b/ChangeLog.txt
index d09120a68..d2dd1df9d 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -752,4 +752,6 @@
 	  apps/platform/stm3240g-eval/up_cxxinitialize.c:  Now it is available
 	  in user-space in the kernel mode build (2013-12-29).
 	* apps/examples/mount/Kconfig:  Fill in empty Kconfig file (2013-12-31).
+	* builtin/Makefile: Fixes for native Windows build from Max Holtzberg
+	  (2014-1-4).
 
diff --git a/builtin/Makefile b/builtin/Makefile
index f89532871..9b64e7b17 100644
--- a/builtin/Makefile
+++ b/builtin/Makefile
@@ -58,7 +58,7 @@ endif
 endif
 
 ROOTDEPPATH	= --dep-path .
-VPATH		= 
+VPATH		=
 
 # Build Targets
 
@@ -78,7 +78,7 @@ builtin_list.h: registry$(DELIM).updated
 	$(call DELFILE, builtin_list.h)
 	$(Q) touch builtin_list.h
 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
-	$(Q) for /f %%G in ('dir /b registry\*.bdat`) do ( type registry\%%G >> builtin_list.h )
+	$(Q) (for /f %%G in ('dir /b registry\*.bdat') do ( type registry\%%G >> builtin_list.h )) || echo ""
 else
 	$(Q) ( \
 		filelist=`ls registry/*.bdat 2>/dev/null || echo ""`; \
@@ -92,7 +92,7 @@ builtin_proto.h: registry$(DELIM).updated
 	$(call DELFILE, builtin_proto.h)
 	$(Q) touch builtin_proto.h
 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
-	$(Q) for /f %%G in ('dir /b registry\*.pdat`) do ( type registry\%%G >> builtin_proto.h )
+	$(Q) (for /f %%G in ('dir /b registry\*.pdat') do ( type registry\%%G >> builtin_proto.h )) || echo ""
 else
 	$(Q) ( \
 		filelist=`ls registry/*.pdat 2>/dev/null || echo ""`; \