diff --git a/scsh/syscalls1.c b/scsh/syscalls1.c
index 4acb3df..3029410 100644
--- a/scsh/syscalls1.c
+++ b/scsh/syscalls1.c
@@ -494,22 +494,26 @@ char *scm_gethostname(void)
     int gethostname(); 
     gethostname(hostname, MAXHOSTNAMELEN);
     return hostname;
-    }
+}
 
 #include <errno.h>
 
 char *errno_msg(int i)
 {
-  /* temp hack until we figure out what to do about losing sys_errlist's */
-extern
+#ifdef HAVE_STRERROR
+    return(strerror(i));
+#else
+    /* temp hack until we figure out what to do about losing sys_errlist's */
+    extern
 #ifdef HAVE_CONST_SYS_ERRLIST
-  const
+	const
 #endif
-      char *sys_errlist[]; 
-  extern int sys_nerr;
-  return ( i < 0 || i > sys_nerr ) ? NULL		/* i.e., #f */
-      				   : (char*) sys_errlist[i];
-  }
+	    char *sys_errlist[]; 
+    extern int sys_nerr;
+    return ( i < 0 || i > sys_nerr ) ? NULL /* i.e., #f */
+	: (char*) sys_errlist[i];
+#endif /* !HAVE_STRERROR */
+}
 
 /* Some of fcntl()
 ******************