diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index e6a46ad93..0fee8d0ac 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,13 @@
+2005-05-12  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* libc/sys/linux/getpwuid.c: Removed.
+	* libc/sys/linux/getpwnam.c: Removed.
+	* libc/sys/linux/getpwent.c: New file containing logic
+	from files removed above.  This allows overriding of file
+	in libc/unix.
+	* libc/sys/linux/Makefile.am: Support changes above.
+	* libc/sys/linux/Makefile.in: Regenerated.
+
 2005-04-28  Jeff Johnston  <jjohnstn@redhat.com>
 
 	* libc/stdio/vfscanf.c (__svfscanf_r): Fix code thinko
diff --git a/newlib/libc/sys/linux/Makefile.am b/newlib/libc/sys/linux/Makefile.am
index 56842cebb..de11547a3 100644
--- a/newlib/libc/sys/linux/Makefile.am
+++ b/newlib/libc/sys/linux/Makefile.am
@@ -146,8 +146,7 @@ ELIX_3_OBJS = \
 
 ELIX_4_OBJS = \
 	getlogin.$(oext) \
-	getpwnam.$(oext) \
-	getpwuid.$(oext) \
+	getpwent.$(oext) \
 	stack.$(oext)
 
 if ELIX_LEVEL_1
diff --git a/newlib/libc/sys/linux/Makefile.in b/newlib/libc/sys/linux/Makefile.in
index 3f110fab2..ead358265 100644
--- a/newlib/libc/sys/linux/Makefile.in
+++ b/newlib/libc/sys/linux/Makefile.in
@@ -118,7 +118,7 @@ ELIX_2_OBJS =  	aio64.$(oext) 	confstr.$(oext) 	ctermid.$(oext) 	fclean.$(oext)
 ELIX_3_OBJS =  	system.$(oext) 	wait.$(oext)
 
 
-ELIX_4_OBJS =  	getlogin.$(oext) 	getpwnam.$(oext) 	getpwuid.$(oext) 	stack.$(oext)
+ELIX_4_OBJS =  	getlogin.$(oext) 	getpwent.$(oext) 	stack.$(oext)
 
 @ELIX_LEVEL_1_TRUE@LIB_OBJS = 
 @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@LIB_OBJS = $(ELIX_2_OBJS)
diff --git a/newlib/libc/sys/linux/getpwent.c b/newlib/libc/sys/linux/getpwent.c
new file mode 100644
index 000000000..9479021e3
--- /dev/null
+++ b/newlib/libc/sys/linux/getpwent.c
@@ -0,0 +1,30 @@
+/* FIXME: dummy stub for now.  */
+#include <errno.h>
+#include <pwd.h>
+
+struct passwd *
+_DEFUN (getpwnam, (name),
+	_CONST char *name)
+{
+  errno = ENOSYS;
+  return NULL;
+}
+
+/* FIXME: dummy stub for now.  */
+struct passwd *
+_DEFUN (getpwuid, (uid),
+	uid_t uid)
+{
+  errno = ENOSYS;
+  return NULL;
+}
+
+/* FIXME: dummy stub for now.  */
+struct passwd *
+_DEFUN (getpwent, (uid),
+	uid_t uid)
+{
+  errno = ENOSYS;
+  return NULL;
+}
+
diff --git a/newlib/libc/sys/linux/getpwnam.c b/newlib/libc/sys/linux/getpwnam.c
deleted file mode 100644
index c90562c5a..000000000
--- a/newlib/libc/sys/linux/getpwnam.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* FIXME: dummy stub for now.  */
-#include <errno.h>
-#include <pwd.h>
-
-struct passwd *
-_DEFUN (getpwnam, (name),
-	_CONST char *name)
-{
-  errno = ENOSYS;
-  return NULL;
-}
-
diff --git a/newlib/libc/sys/linux/getpwuid.c b/newlib/libc/sys/linux/getpwuid.c
deleted file mode 100644
index 4e9fcb220..000000000
--- a/newlib/libc/sys/linux/getpwuid.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* FIXME: dummy stub for now.  */
-#include <errno.h>
-#include <pwd.h>
-
-struct passwd *
-_DEFUN (getpwuid, (uid),
-	uid_t uid)
-{
-  errno = ENOSYS;
-  return NULL;
-}
-