diff --git a/ChangeLog b/ChangeLog
index c920ff44f7..e400d5c5cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Oct 18 03:33:22 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
+
+	* sysdeps/generic/_strerror.c: Declare _sys_errlist and _sys_nerr.
+
+	* hurd/hurdlookup.c (__hurd_file_name_lookup_retry): For magic
+	`fd/', pass the right pointer to strtol to parse the number.
+
 Tue Oct 17 23:00:10 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
 
 	* sysdeps/mach/_strerror.c: Include stdio-common/_itoa.h instead
diff --git a/hurd/hurdlookup.c b/hurd/hurdlookup.c
index bc3366cdf5..ee97a13fca 100644
--- a/hurd/hurdlookup.c
+++ b/hurd/hurdlookup.c
@@ -170,7 +170,7 @@ __hurd_file_name_lookup_retry (error_t (*use_init_port)
 		  char *end;
 		  int save = errno;
 		  errno = 0;
-		  fd = (int) strtol (retryname, &end, 10);
+		  fd = (int) strtol (&retryname[3], &end, 10);
 		  if (end == NULL || errno || /* Malformed number.  */
 		      /* Check for excess text after the number.  A slash
 			 is valid; it ends the component.  Anything else
diff --git a/sysdeps/generic/_strerror.c b/sysdeps/generic/_strerror.c
index 72ebb216bf..71fabe7695 100644
--- a/sysdeps/generic/_strerror.c
+++ b/sysdeps/generic/_strerror.c
@@ -31,6 +31,9 @@ _strerror_internal (errnum, buf, buflen)
      char *buf;
      size_t buflen;
 {
+  extern const char *const _sys_errlist[];
+  extern const int _sys_nerr;
+
   if (errnum < 0 || errnum > _sys_nerr)
     {
       int len = __snprintf (buf, buflen, _("Unknown error %d"), errnum);