diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 90b4d29d1..9c08bd882 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-18  Michael Gerdau  <mgdde@users.sourceforge.net>
+
+	* include/wincon.h (AttachConsole): Correct _WIN32_WINNT guard.
+	(ATTACH_PARENT_PROCESS): Define.
+	(CONSOLE_WINDOWED_MODE): Correct definition to match MSDN
+	documentation.
+
 2005-07-17  Benoit Blanchon  <bblanchon@users.sourceforge.net>
 
 	* include/winbase.h (QueueUserWorkItem): Add prototype.
@@ -58,7 +65,7 @@
 
 2005-03-16  Christopher Faylor  <cgf@timesys.com>
 
-	* winclude/winnt.h (SYSTEM_LUID): Fix definitition invalidated by below
+	* include/winnt.h (SYSTEM_LUID): Fix definitition invalidated by below
 	change.
 
 2005-03-16  Danny Smith  <dannysmith@users.sourceforge.net>
@@ -246,7 +253,7 @@
 
 	* include/winuser.h (LLKHF_EXTENDED, LLKHF_INJECTED, LLKHF_UP):
 	Add defines.
-	(LLKHF_ALTDOWN): Define based on KF_ALTDOWN,
+	(LLKHF_ALTDOWN): Define based on KF_ALTDOWN.
              
 2004-11-19  Benoit Blanchon  <bblanchon@users.sourceforge.net>
 
diff --git a/winsup/w32api/include/wincon.h b/winsup/w32api/include/wincon.h
index 541e5efcd..a43fe17f9 100644
--- a/winsup/w32api/include/wincon.h
+++ b/winsup/w32api/include/wincon.h
@@ -18,7 +18,7 @@ extern "C" {
 #define BACKGROUND_INTENSITY	128
 #if (_WIN32_WINNT >= 0x0501)
 #define CONSOLE_FULLSCREEN_MODE	1
-#define CONSOLE_WINDOWED_MODE	0
+#define CONSOLE_WINDOWED_MODE	2
 #endif 
 #define CTRL_C_EVENT 0
 #define CTRL_BREAK_EVENT 1
@@ -126,7 +126,8 @@ typedef struct _INPUT_RECORD {
 } INPUT_RECORD,*PINPUT_RECORD;
 
 BOOL WINAPI AllocConsole(void);
-#if (_WIN32_WINNT >= 0x0501)
+#if (_WIN32_WINNT >= 0x0500)
+#define ATTACH_PARENT_PROCESS	((DWORD)-1)
 BOOL WINAPI AttachConsole(DWORD);
 #endif
 HANDLE WINAPI CreateConsoleScreenBuffer(DWORD,DWORD,CONST SECURITY_ATTRIBUTES*,DWORD,LPVOID);