diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 33cb93680..1a8c55956 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,4 +1,9 @@
-2008-11-24  Corinna Vinschen  <corinna@vinschen.de>
+2008-11-24  Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* libc/posix/Makefile.am: Compile readdir_r.c
+	* libc/posix/Makefile.in: Regenerated.
+
+   not readdir.c twice.2008-11-24  Corinna Vinschen  <corinna@vinschen.de>
 
 	* libc/include/stdio.h (__SMOD): Remove definition of unused flag.
 	* libc/include/sys/reent.h (struct __sFILE): Add _flags2 member.
diff --git a/newlib/libc/posix/Makefile.am b/newlib/libc/posix/Makefile.am
index 7da0872c0..c8c1a1254 100644
--- a/newlib/libc/posix/Makefile.am
+++ b/newlib/libc/posix/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 GENERAL_SOURCES = \
 	closedir.c collate.c collcmp.c creat.c \
 	fnmatch.c glob.c _isatty.c isatty.c \
-	opendir.c readdir.c readdir.c \
+	opendir.c readdir.c readdir_r.c \
 	regcomp.c regerror.c regexec.c regfree.c \
 	rewinddir.c sleep.c usleep.c \
 	telldir.c
diff --git a/newlib/libc/posix/Makefile.in b/newlib/libc/posix/Makefile.in
index 61895dbc8..79a0c64e3 100644
--- a/newlib/libc/posix/Makefile.in
+++ b/newlib/libc/posix/Makefile.in
@@ -62,7 +62,7 @@ am__objects_1 = lib_a-closedir.$(OBJEXT) lib_a-collate.$(OBJEXT) \
 	lib_a-fnmatch.$(OBJEXT) lib_a-glob.$(OBJEXT) \
 	lib_a-_isatty.$(OBJEXT) lib_a-isatty.$(OBJEXT) \
 	lib_a-opendir.$(OBJEXT) lib_a-readdir.$(OBJEXT) \
-	lib_a-readdir.$(OBJEXT) lib_a-regcomp.$(OBJEXT) \
+	lib_a-readdir_r.$(OBJEXT) lib_a-regcomp.$(OBJEXT) \
 	lib_a-regerror.$(OBJEXT) lib_a-regexec.$(OBJEXT) \
 	lib_a-regfree.$(OBJEXT) lib_a-rewinddir.$(OBJEXT) \
 	lib_a-sleep.$(OBJEXT) lib_a-usleep.$(OBJEXT) \
@@ -86,9 +86,9 @@ lib_a_OBJECTS = $(am_lib_a_OBJECTS)
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libposix_la_LIBADD =
 am__objects_6 = closedir.lo collate.lo collcmp.lo creat.lo fnmatch.lo \
-	glob.lo _isatty.lo isatty.lo opendir.lo readdir.lo readdir.lo \
-	regcomp.lo regerror.lo regexec.lo regfree.lo rewinddir.lo \
-	sleep.lo usleep.lo telldir.lo
+	glob.lo _isatty.lo isatty.lo opendir.lo readdir.lo \
+	readdir_r.lo regcomp.lo regerror.lo regexec.lo regfree.lo \
+	rewinddir.lo sleep.lo usleep.lo telldir.lo
 am__objects_7 = scandir.lo seekdir.lo
 am__objects_8 = execl.lo execle.lo execlp.lo execv.lo execve.lo \
 	execvp.lo wordexp.lo wordfree.lo
@@ -292,7 +292,7 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 GENERAL_SOURCES = \
 	closedir.c collate.c collcmp.c creat.c \
 	fnmatch.c glob.c _isatty.c isatty.c \
-	opendir.c readdir.c readdir.c \
+	opendir.c readdir.c readdir_r.c \
 	regcomp.c regerror.c regexec.c regfree.c \
 	rewinddir.c sleep.c usleep.c \
 	telldir.c
@@ -452,6 +452,12 @@ lib_a-readdir.o: readdir.c
 lib_a-readdir.obj: readdir.c
 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-readdir.obj `if test -f 'readdir.c'; then $(CYGPATH_W) 'readdir.c'; else $(CYGPATH_W) '$(srcdir)/readdir.c'; fi`
 
+lib_a-readdir_r.o: readdir_r.c
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-readdir_r.o `test -f 'readdir_r.c' || echo '$(srcdir)/'`readdir_r.c
+
+lib_a-readdir_r.obj: readdir_r.c
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-readdir_r.obj `if test -f 'readdir_r.c'; then $(CYGPATH_W) 'readdir_r.c'; else $(CYGPATH_W) '$(srcdir)/readdir_r.c'; fi`
+
 lib_a-regcomp.o: regcomp.c
 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-regcomp.o `test -f 'regcomp.c' || echo '$(srcdir)/'`regcomp.c