diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 96d8cd39f..392f6f07c 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-07  Corinna Vinschen  <corinna@vinschen.de>
+
+	* glob.cc (MAXPATHLEN): Reinstantiate with a value of 8192.
+
 2012-03-05  Denis Excoffier  <cygwin@Denis-Excoffier.org>
 
 	* pinfo.cc (_pinfo::dup_proc_pipe): Fix order of arguments in debug
diff --git a/winsup/cygwin/glob.cc b/winsup/cygwin/glob.cc
index b732f14c5..4cc442eab 100644
--- a/winsup/cygwin/glob.cc
+++ b/winsup/cygwin/glob.cc
@@ -111,6 +111,9 @@ __FBSDID("$FreeBSD: src/lib/libc/gen/glob.c,v 1.28 2010/05/12 17:44:00 gordon Ex
 #define Cchar(c)	(ignore_case_with_glob ? towlower (c) : (c))
 #endif
 
+#undef MAXPATHLEN
+#define MAXPATHLEN 8192
+
 #define	DOLLAR		'$'
 #define	DOT		'.'
 #define	EOS		'\0'