diff --git a/build/Makefile.am b/build/Makefile.am
index 8aa4d5bc..d58c9758 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -61,7 +61,6 @@ config-nucleus-mnt.h                     \
 config-nucleus-monaco.h                  \
 config-threadx-vfanvil.h                 \
 config-threadx-null.h                	 \
-config-win32.h                           \
 config-mgdemo-win.h                      \
 config-psos-standalone.h                 \
 config-psos-threads.h                    \
@@ -82,13 +81,5 @@ rules-mx21.ose                           \
 minigui_ads_prj_threadx.tar.gz			 \
 minigui_ads_prj_nucleus.tar.gz			 \
 minigui_ads_prj_ucos2.tar.gz			 \
-pthreadVC1.dll							 \
-pthreadVC1.lib							 \
-dirent.dll								 \
-dirent.lib								 \
-Defs.win32                               \
-Defs-mgext.win32                         \
-makedefs.msvc                            \
-minigui-win32.dsp                        \
-minigui-win32.dsw
+win32
 
diff --git a/build/rules-longxin.vxworks b/build/rules-longxin.vxworks
old mode 100755
new mode 100644
diff --git a/build/Defs-mgext.win32 b/build/win32/Defs-mgext.win32
similarity index 100%
rename from build/Defs-mgext.win32
rename to build/win32/Defs-mgext.win32
diff --git a/build/Defs.win32 b/build/win32/Defs.win32
similarity index 100%
rename from build/Defs.win32
rename to build/win32/Defs.win32
diff --git a/build/config-win32.h b/build/win32/config-win32.h
similarity index 100%
rename from build/config-win32.h
rename to build/win32/config-win32.h
diff --git a/build/dirent.dll b/build/win32/dirent.dll
similarity index 100%
rename from build/dirent.dll
rename to build/win32/dirent.dll
diff --git a/build/dirent.lib b/build/win32/dirent.lib
similarity index 100%
rename from build/dirent.lib
rename to build/win32/dirent.lib
diff --git a/build/jpeg62.dll b/build/win32/jpeg62.dll
similarity index 100%
rename from build/jpeg62.dll
rename to build/win32/jpeg62.dll
diff --git a/build/libjpeg.lib b/build/win32/libjpeg.lib
similarity index 100%
rename from build/libjpeg.lib
rename to build/win32/libjpeg.lib
diff --git a/build/libpng.lib b/build/win32/libpng.lib
similarity index 100%
rename from build/libpng.lib
rename to build/win32/libpng.lib
diff --git a/build/libpng13.dll b/build/win32/libpng13.dll
similarity index 100%
rename from build/libpng13.dll
rename to build/win32/libpng13.dll
diff --git a/build/libz.lib b/build/win32/libz.lib
similarity index 100%
rename from build/libz.lib
rename to build/win32/libz.lib
diff --git a/build/minigui-win32.dep b/build/win32/minigui-win32.dep
similarity index 100%
rename from build/minigui-win32.dep
rename to build/win32/minigui-win32.dep
diff --git a/build/minigui-win32.dsp b/build/win32/minigui-win32.dsp
similarity index 100%
rename from build/minigui-win32.dsp
rename to build/win32/minigui-win32.dsp
diff --git a/build/minigui-win32.dsw b/build/win32/minigui-win32.dsw
similarity index 100%
rename from build/minigui-win32.dsw
rename to build/win32/minigui-win32.dsw
diff --git a/build/minigui-win32.mak b/build/win32/minigui-win32.mak
similarity index 100%
rename from build/minigui-win32.mak
rename to build/win32/minigui-win32.mak
diff --git a/build/minigui-win32.msvc b/build/win32/minigui-win32.msvc
similarity index 100%
rename from build/minigui-win32.msvc
rename to build/win32/minigui-win32.msvc
diff --git a/build/msvc_recommended_pragmas.h b/build/win32/msvc_recommended_pragmas.h
similarity index 100%
rename from build/msvc_recommended_pragmas.h
rename to build/win32/msvc_recommended_pragmas.h
diff --git a/build/pthreadVC1.dll b/build/win32/pthreadVC1.dll
similarity index 100%
rename from build/pthreadVC1.dll
rename to build/win32/pthreadVC1.dll
diff --git a/build/pthreadVC1.lib b/build/win32/pthreadVC1.lib
similarity index 100%
rename from build/pthreadVC1.lib
rename to build/win32/pthreadVC1.lib
diff --git a/build/zlib1.dll b/build/win32/zlib1.dll
similarity index 100%
rename from build/zlib1.dll
rename to build/win32/zlib1.dll
diff --git a/configure.ac b/configure.ac
index b4c97a20..8fdbff54 100644
--- a/configure.ac
+++ b/configure.ac
@@ -507,7 +507,7 @@ AC_ARG_ENABLE(fontsystem,
 build_incorefont_system=$enableval)
 
 AC_ARG_ENABLE(upfsupport,
-[  --enable-upfsupport      build support for FMSOft Unicode Prerendered Font (UPF) <default=yes>],
+[  --enable-upfsupport      build support for FMSoft Unicode Prerendered Font (UPF) <default=yes>],
 build_upf_support=$enableval)
 
 AC_ARG_ENABLE(fonttimes,