diff --git a/ChangeLog b/ChangeLog
index 66f914d21..05a7ff0eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@
 	relative path in a subdirectory, don't do any path search.
 	(g_get_any_init): (Win32) Also look for the USERPROFILE env var
 	indicating the home directory equivalent.
+	(g_find_program_in_path): (Win32): Use MAXPATHLEN, not PATH_MAX
+	which isn't defined with MSVC.
 
 	* testglib.c (main): Test g_find_program_in_path() on Win32 by
 	looking for more.com and regedit.
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 66f914d21..05a7ff0eb 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -10,6 +10,8 @@
 	relative path in a subdirectory, don't do any path search.
 	(g_get_any_init): (Win32) Also look for the USERPROFILE env var
 	indicating the home directory equivalent.
+	(g_find_program_in_path): (Win32): Use MAXPATHLEN, not PATH_MAX
+	which isn't defined with MSVC.
 
 	* testglib.c (main): Test g_find_program_in_path() on Win32 by
 	looking for more.com and regedit.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 66f914d21..05a7ff0eb 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -10,6 +10,8 @@
 	relative path in a subdirectory, don't do any path search.
 	(g_get_any_init): (Win32) Also look for the USERPROFILE env var
 	indicating the home directory equivalent.
+	(g_find_program_in_path): (Win32): Use MAXPATHLEN, not PATH_MAX
+	which isn't defined with MSVC.
 
 	* testglib.c (main): Test g_find_program_in_path() on Win32 by
 	looking for more.com and regedit.
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 66f914d21..05a7ff0eb 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -10,6 +10,8 @@
 	relative path in a subdirectory, don't do any path search.
 	(g_get_any_init): (Win32) Also look for the USERPROFILE env var
 	indicating the home directory equivalent.
+	(g_find_program_in_path): (Win32): Use MAXPATHLEN, not PATH_MAX
+	which isn't defined with MSVC.
 
 	* testglib.c (main): Test g_find_program_in_path() on Win32 by
 	looking for more.com and regedit.
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 66f914d21..05a7ff0eb 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -10,6 +10,8 @@
 	relative path in a subdirectory, don't do any path search.
 	(g_get_any_init): (Win32) Also look for the USERPROFILE env var
 	indicating the home directory equivalent.
+	(g_find_program_in_path): (Win32): Use MAXPATHLEN, not PATH_MAX
+	which isn't defined with MSVC.
 
 	* testglib.c (main): Test g_find_program_in_path() on Win32 by
 	looking for more.com and regedit.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 66f914d21..05a7ff0eb 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -10,6 +10,8 @@
 	relative path in a subdirectory, don't do any path search.
 	(g_get_any_init): (Win32) Also look for the USERPROFILE env var
 	indicating the home directory equivalent.
+	(g_find_program_in_path): (Win32): Use MAXPATHLEN, not PATH_MAX
+	which isn't defined with MSVC.
 
 	* testglib.c (main): Test g_find_program_in_path() on Win32 by
 	looking for more.com and regedit.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 66f914d21..05a7ff0eb 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -10,6 +10,8 @@
 	relative path in a subdirectory, don't do any path search.
 	(g_get_any_init): (Win32) Also look for the USERPROFILE env var
 	indicating the home directory equivalent.
+	(g_find_program_in_path): (Win32): Use MAXPATHLEN, not PATH_MAX
+	which isn't defined with MSVC.
 
 	* testglib.c (main): Test g_find_program_in_path() on Win32 by
 	looking for more.com and regedit.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 66f914d21..05a7ff0eb 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -10,6 +10,8 @@
 	relative path in a subdirectory, don't do any path search.
 	(g_get_any_init): (Win32) Also look for the USERPROFILE env var
 	indicating the home directory equivalent.
+	(g_find_program_in_path): (Win32): Use MAXPATHLEN, not PATH_MAX
+	which isn't defined with MSVC.
 
 	* testglib.c (main): Test g_find_program_in_path() on Win32 by
 	looking for more.com and regedit.
diff --git a/glib/gutils.c b/glib/gutils.c
index be7feb684..48ac588ac 100644
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -270,7 +270,7 @@ g_find_program_in_path (const gchar *program)
 #else
   {
     gchar *tmp;
-    gchar moddir[PATH_MAX], sysdir[PATH_MAX], windir[PATH_MAX];
+    gchar moddir[MAXPATHLEN], sysdir[MAXPATHLEN], windir[MAXPATHLEN];
 
     GetModuleFileName (NULL, moddir, sizeof (moddir));
     tmp = g_path_get_dirname (moddir);
diff --git a/gutils.c b/gutils.c
index be7feb684..48ac588ac 100644
--- a/gutils.c
+++ b/gutils.c
@@ -270,7 +270,7 @@ g_find_program_in_path (const gchar *program)
 #else
   {
     gchar *tmp;
-    gchar moddir[PATH_MAX], sysdir[PATH_MAX], windir[PATH_MAX];
+    gchar moddir[MAXPATHLEN], sysdir[MAXPATHLEN], windir[MAXPATHLEN];
 
     GetModuleFileName (NULL, moddir, sizeof (moddir));
     tmp = g_path_get_dirname (moddir);