diff --git a/winsup/ChangeLog b/winsup/ChangeLog
index c04c56281..d755a2663 100644
--- a/winsup/ChangeLog
+++ b/winsup/ChangeLog
@@ -1,3 +1,7 @@
+2003-04-11  Christopher Faylor  <cgf@redhat.com>
+
+	* Makefile.common (w32api_lib): Fix w32api detection.
+
 2003-03-28  Christopher Faylor  <cgf@redhat.com>
 
 	* Makefile.common (ALL_CXXFLAGS): Make normal '=' type variable so that
diff --git a/winsup/Makefile.common b/winsup/Makefile.common
index d0c69ab7c..dcac394bb 100644
--- a/winsup/Makefile.common
+++ b/winsup/Makefile.common
@@ -10,7 +10,7 @@
 
 # This makefile requires GNU make.
 
-CFLAGS_COMMON:=-Wall -Wwrite-strings -fno-common -pipe -Winline -fbuiltin -fmessage-length=0# -finline-functions
+CFLAGS_COMMON:=-march=i386 -Wall -Wwrite-strings -fno-common -pipe -Winline -fbuiltin -fmessage-length=0# -finline-functions
 MALLOC_DEBUG:=#-DMALLOC_DEBUG -I/cygnus/src/uberbaum/winsup/cygwin/dlmalloc
 MALLOC_OBJ:=#/cygnus/src/uberbaum/winsup/cygwin/dlmalloc/malloc.o
 
@@ -120,7 +120,7 @@ endif
 
 nostdinc:=${shell [ -d "$(updir)/w32api" ] && echo "-nostdinc -nostdinc++"}
 ifeq (,$(nostdinc))
-override w32api_lib:=${subst //,/,${shell $(CC) -print-search-dirs | awk -F: '/^librar/{for (i = 1; i <= NF; i++) if ($$i ~ /\/lib\/*$$/) print $$i}'}/w32api}
+override w32api_lib:=${subst //,/,${shell $(CC) -print-search-dirs | awk -F: '/^librar/{for (i = 1; i <= NF; i++) if ($$i ~ /\/lib\/*$$/) foo=$$i} END{print foo}'}/w32api}
 endif
 
 COMPILE_CXX=$(CXX) $c $(nostdinc) $(ALL_CXXFLAGS) $(GCC_INCLUDE) \