diff --git a/CHANGELOG b/CHANGELOG
index 195ec9a..916d6a8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@
 
 -- stuff in the stable-1.0 branch, backported from 2.0.0 dev branch, etc ---
 
+03112008 - Fixed wrong array index in Windows platform layer (thanks, James!).
 03082008 - Fixed compiler warnings in Windows platform layer (thanks, Dennis!).
 02202008 - Various archiver swap and compare functions now check if they are
            swapping/comparing an item against itself, for efficiency and
diff --git a/CREDITS b/CREDITS
index ac49c23..5439abb 100644
--- a/CREDITS
+++ b/CREDITS
@@ -78,6 +78,7 @@ Mingw support:
 
 Bug fixes:
     Jörg Walter
+    James Haley
 
 Windows .rc file:
     Dennis Schridde
diff --git a/platform/win32.c b/platform/win32.c
index e56a3c6..8dc2752 100644
--- a/platform/win32.c
+++ b/platform/win32.c
@@ -90,9 +90,9 @@ static const char *win32strerror(void)
     );
 
     if (rc == 0)
-        msgbuf = '\0';  /* oh well. */
+        msgbuf[0] = '\0';  /* oh well. Empty string. */
 
-        /* chop off newlines. */
+    /* chop off newlines... */
     for (ptr = msgbuf; *ptr; ptr++)
     {
         if ((*ptr == '\n') || (*ptr == '\r'))