diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 8704d9ec0..f804da3eb 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,12 @@
+2003-04-18  Christopher Faylor  <cgf@redhat.com>
+
+	* Makefile.in: Use ${nostdlib} variable.
+
+2003-04-18  Diego Biurrun  <diego@biurrun.de>
+
+	* fhandler_proc.cc (format_proc_cpuinfo): Change /proc/cpuinfo "vendor
+	id" string to "vendor_id" to conform with Linux systems.
+
 2003-04-17  Christopher Faylor  <cgf@redhat.com>
 
 	* syscalls.cc (setsid): Don't call FreeConsole if ctty is already < 0.
diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in
index 2a29e454a..e357943b8 100644
--- a/winsup/cygwin/Makefile.in
+++ b/winsup/cygwin/Makefile.in
@@ -340,7 +340,7 @@ maintainer-clean realclean: clean
 
 # Rule to build cygwin.dll
 $(TEST_DLL_NAME): $(LDSCRIPT) $(DLL_OFILES) $(DEF_FILE) $(DLL_IMPORTS) $(LIBC) $(LIBM) $(API_VER) Makefile winver_stamp
-	$(CXX) $(CXXFLAGS) -nostdlib -Wl,-T$(firstword $^) -Wl,--out-implib,cygdll.a -shared -o $@ \
+	$(CXX) $(CXXFLAGS) $(nostdlib) -Wl,-T$(firstword $^) -Wl,--out-implib,cygdll.a -shared -o $@ \
 	-e $(DLL_ENTRY) $(DEF_FILE) $(DLL_OFILES) version.o winver.o \
 	$(MALLOC_OBJ) $(LIBM) $(LIBC) \
 	-lgcc $(DLL_IMPORTS)
diff --git a/winsup/cygwin/fhandler_proc.cc b/winsup/cygwin/fhandler_proc.cc
index 28fe87948..a6f759d2e 100644
--- a/winsup/cygwin/fhandler_proc.cc
+++ b/winsup/cygwin/fhandler_proc.cc
@@ -606,7 +606,7 @@ format_proc_cpuinfo (char *destbuf, size_t maxsize)
 	{
 	  bufptr += __small_sprintf (bufptr, "processor       : %d\n", cpu_number);
 	  read_value ("VendorIdentifier", REG_SZ);
-	  bufptr += __small_sprintf (bufptr, "vendor id       : %s\n", szBuffer);
+	  bufptr += __small_sprintf (bufptr, "vendor_id       : %s\n", szBuffer);
 	  read_value ("Identifier", REG_SZ);
 	  bufptr += __small_sprintf (bufptr, "identifier      : %s\n", szBuffer);
           if (wincap.is_winnt ())
@@ -640,7 +640,7 @@ format_proc_cpuinfo (char *destbuf, size_t maxsize)
 	  cpuid (&maxf, &vendor_id[0], &vendor_id[2], &vendor_id[1], 0);
 	  maxf &= 0xffff;
 	  vendor_id[3] = 0;
-	  bufptr += __small_sprintf (bufptr, "vendor id       : %s\n", (char *)vendor_id);
+	  bufptr += __small_sprintf (bufptr, "vendor_id       : %s\n", (char *)vendor_id);
           unsigned cpu_mhz  = 0;
           if (wincap.is_winnt ())
             {