diff --git a/zebra/ChangeLog b/zebra/ChangeLog
index da3210e..cf18a7d 100644
--- a/zebra/ChangeLog
+++ b/zebra/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-30  Greg Troxel  <gdt@poblano.ir.bbn.com>
+
+	* main.c: define thread_master variable so that linking with
+	libzebra.so doesn't fail.  Arguably zclient.o should be in a
+	separate library, but this is far less disruptive.
+
 2004-06-12 Robert Olsson <Robert.Olsson at data.slu.se>
 
         * Added IRDP support.
diff --git a/zebra/Makefile.am b/zebra/Makefile.am
index 6b494e7..0782894 100644
--- a/zebra/Makefile.am
+++ b/zebra/Makefile.am
@@ -30,7 +30,7 @@
 	connected.h ioctl.h rib.h rt.h zserv.h redistribute.h debug.h rtadv.h \
 	interface.h ipforward.h irdp.h
 
-zebra_LDADD = ../lib/libzebra.a $(otherobj) $(LIBCAP) $(LIB_IPV6)
+zebra_LDADD = $(otherobj) $(LIBCAP) $(LIB_IPV6) -L../lib -lzebra
 
 zebra_DEPENDENCIES = $(otherobj)
 
@@ -42,8 +42,8 @@
 	ioctl.c ioctl_solaris.c \
 	GNOME-SMI GNOME-PRODUCT-ZEBRA-MIB
 
-#client : client_main.o ../lib/libzebra.a
-#	$(CC) -g -o client client_main.o ../lib/libzebra.a $(LIBS) $(LIB_IPV6)
+#client : client_main.o -L../lib -lzebra
+#	$(CC) -g -o client client_main.o -L../lib -lzebra $(LIBS) $(LIB_IPV6)
 
 quaggaconfdir = $(sysconfdir)
 
diff --git a/zebra/main.c b/zebra/main.c
index 1083ae5..6d40d70 100644
--- a/zebra/main.c
+++ b/zebra/main.c
@@ -48,6 +48,9 @@
 pid_t old_pid;
 pid_t pid;
 
+/* Pacify zclient.o in libzebra, which expects this variable. */
+struct thread_master *master;
+
 /* Route retain mode flag. */
 int retain_mode = 0;