diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 380d0c124..a101ffbdb 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,10 @@
+2013-10-18  Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* libc/include/sys/unistd.h (MAXPATHLEN): Delete.
+	* libc/include/sys/param.h (MAXPATHLEN): Define.
+	* libc/sys/rtems/sys/param.h (MAXPATHLEN): Likewise.
+	* libc/unix/getcwd.c: Include <sys/param.h> for MAXPATHLEN.
+
 2013-10-10  Sebastian Huber <sebastian.huber@embedded-brains.de>
 
 	* libc/libc/sys/rtems/sys/param.h: Update some parameters to
diff --git a/newlib/libc/include/sys/param.h b/newlib/libc/include/sys/param.h
index 7e8762a65..ef203d3ec 100644
--- a/newlib/libc/include/sys/param.h
+++ b/newlib/libc/include/sys/param.h
@@ -6,6 +6,7 @@
 # define _SYS_PARAM_H
 
 #include <sys/config.h>
+#include <sys/syslimits.h>
 #include <machine/endian.h>
 #include <machine/param.h>
 
@@ -19,6 +20,8 @@
 # define PATHSIZE (1024)
 #endif
 
+#define MAXPATHLEN PATH_MAX
+
 #define MAX(a,b) ((a) > (b) ? (a) : (b))
 #define MIN(a,b) ((a) < (b) ? (a) : (b))
 
diff --git a/newlib/libc/include/sys/unistd.h b/newlib/libc/include/sys/unistd.h
index a5f66c0b7..f1aacfa77 100644
--- a/newlib/libc/include/sys/unistd.h
+++ b/newlib/libc/include/sys/unistd.h
@@ -500,10 +500,6 @@ int	_EXFUN(unlinkat, (int, const char *, int));
 #define _CS_V6_ENV                            _CS_V7_ENV
 #endif
 
-#ifndef __CYGWIN__
-# define	MAXPATHLEN	1024
-#endif
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/newlib/libc/sys/rtems/sys/param.h b/newlib/libc/sys/rtems/sys/param.h
index eac24e91c..808745f85 100644
--- a/newlib/libc/sys/rtems/sys/param.h
+++ b/newlib/libc/sys/rtems/sys/param.h
@@ -156,9 +156,7 @@
  * It should be set high enough to allow all legitimate uses, but halt
  * infinite loops reasonably quickly.
  */
-#if !defined(__rtems__)
 #define	MAXPATHLEN	PATH_MAX
-#endif
 #define MAXSYMLINKS	32
 
 /* Bit map related macros. */
diff --git a/newlib/libc/unix/getcwd.c b/newlib/libc/unix/getcwd.c
index b49a4b6e0..92f1b20fd 100644
--- a/newlib/libc/unix/getcwd.c
+++ b/newlib/libc/unix/getcwd.c
@@ -32,6 +32,7 @@
 static char sccsid[] = "@(#)getcwd.c	5.11 (Berkeley) 2/24/91";
 #endif /* LIBC_SCCS and not lint */
 
+#include <sys/param.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <dirent.h>