--- a/util.h
+++ b/util.h
@@ -36,19 +36,20 @@
 #include <sys/stat.h>
 #include <unistd.h>			            /* for _exit(2), geteuid(2) */
 
-//
-// POSIX.1 is, IMHO, brain-damaged in the way it makes you determine the
-// maximum path-name length, so we'll simply pick a sufficiently large constant
-// such as 1024.  In practice, this is the actual value used on many SVR4 as
-// well as 4.3+BSD systems.
-//
-// See also: W. Richard Stevens.  "Advanced Programming in the Unix
-// Environment," Addison-Wesley, Reading, MA, 1993.  pp. 34-42.
-//
-#ifdef	PATH_MAX
-#undef	PATH_MAX
-#endif
-int const		    PATH_MAX = 1024;
+// Forgo upstreams way of setting PATH_MAX and use the value from climits
+// //
+// // POSIX.1 is, IMHO, brain-damaged in the way it makes you determine the
+// // maximum path-name length, so we'll simply pick a sufficiently large constant
+// // such as 1024.  In practice, this is the actual value used on many SVR4 as
+// // well as 4.3+BSD systems.
+// //
+// // See also: W. Richard Stevens.  "Advanced Programming in the Unix
+// // Environment," Addison-Wesley, Reading, MA, 1993.  pp. 34-42.
+// //
+// #ifdef	PATH_MAX
+// #undef	PATH_MAX
+// #endif
+// int const		    PATH_MAX = 1024;
 
 // local
 #include "exit_codes.h"
