diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 135dfc42bd..09a6c3b896 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,17 @@
+Thu Aug 12 20:40:14 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* gdbserver/Makefile.in: Use GDBSERVER_LIBS and
+	GDBSERVER_DEPFILES.  Also remove much (but not all that could be
+	removed) crud inherited from gdb Makefile.in.
+	* config/i386/i386lynx.mh, config/sparc/sun4os4.mh: Define GDBSERVER_*.
+	* gdbserver/README: Say it works on Sun and change configuration
+	instructions slightly.
+
+Wed Aug 11 18:56:59 1993  david d `zoo' zuhn  (zoo@rtl.cygnus.com)
+
+	* config/i386/i386v4.mh: use -lsocket and -lnsl, for remote
+	targets that use BSD style network connections
+
 Wed Aug 11 17:54:24 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
 	* remote-{monitor,bug}.c: Make bug_ops not static (forward declaration
diff --git a/gdb/config/i386/i386lynx.mh b/gdb/config/i386/i386lynx.mh
index b4294cab4e..7c875ef90e 100644
--- a/gdb/config/i386/i386lynx.mh
+++ b/gdb/config/i386/i386lynx.mh
@@ -5,3 +5,5 @@ XM_FILE= xm-i386lynx.h
 NAT_FILE= nm-i386lynx.h
 REGEX=regex.o
 REGEX1=regex.o
+GDBSERVER_LIBS= -lbsd
+GDBSERVER_DEPFILES= remote-inflow.o
diff --git a/gdb/config/sparc/sun4os4.mh b/gdb/config/sparc/sun4os4.mh
index 683544e01a..9399a5f629 100644
--- a/gdb/config/sparc/sun4os4.mh
+++ b/gdb/config/sparc/sun4os4.mh
@@ -4,3 +4,4 @@ XM_FILE= xm-sun4os4.h
 NAT_FILE= nm-sun4os4.h
 NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o sparc-nat.o
 HOST_IPC=-DBSD_IPC
+GDBSERVER_DEPFILES= remote-inflow-sparc.o
diff --git a/gdb/gdbserver/remote-inflow-sparc.c b/gdb/gdbserver/remote-inflow-sparc.c
index 382c54fc78..eb578eee2e 100644
--- a/gdb/gdbserver/remote-inflow-sparc.c
+++ b/gdb/gdbserver/remote-inflow-sparc.c
@@ -48,6 +48,8 @@ char buf2[MAX_REGISTER_RAW_SIZE];
 #include <sys/ptrace.h>
 #include <machine/reg.h>
 
+extern int sys_nerr;
+extern char **sys_errlist;
 extern char **environ;
 extern int errno;
 extern int inferior_pid;