diff --git a/src/afsd/Makefile.in b/src/afsd/Makefile.in
index 96b545d78f..a25ebf0ba8 100644
--- a/src/afsd/Makefile.in
+++ b/src/afsd/Makefile.in
@@ -22,9 +22,8 @@ all: afsd vsys @ENABLE_FUSE_CLIENT@
 
 AFSLIBS=$(top_builddir)/src/cmd/liboafs_cmd.la \
 	${TOP_LIBDIR}/libafsauthent.a \
-	${TOP_LIBDIR}/libsys.a \
+	$(top_builddir)/src/sys/liboafs_sys.la \
 	$(top_builddir)/src/util/liboafs_util.la \
-	${TOP_LIBDIR}/libafsrpc.a \
 	$(top_builddir)/src/opr/liboafs_opr.la
 
 UAFSLIBS=$(top_builddir)/src/cmd/liboafs_cmd.la \
diff --git a/src/aklog/Makefile.in b/src/aklog/Makefile.in
index bcb9e6c15f..ba65471cdd 100644
--- a/src/aklog/Makefile.in
+++ b/src/aklog/Makefile.in
@@ -11,8 +11,9 @@ MODULE_CFLAGS=@KRB5_CPPFLAGS@ -DALLOW_REGISTER
 
 AKLIBS= ${LIBS} $(LDFLAGS_krb5) $(LIB_krb5)
 AFSLIBS= ${TOP_LIBDIR}/libafsauthent.a \
-         ${TOP_LIBDIR}/libafsrpc.a \
 	 ${TOP_LIBDIR}/libafshcrypto.a \
+	 $(top_builddir)/src/sys/liboafs_sys.la \
+	 $(top_builddir)/src/rxkad/liboafs_rxkad.la \
 	 $(top_builddir)/src/cmd/liboafs_cmd.la \
 	 $(top_builddir)/src/opr/liboafs_opr.la \
          $(top_builddir)/src/util/liboafs_util.la
diff --git a/src/dviced/Makefile.in b/src/dviced/Makefile.in
index 5b220ac267..f27599774f 100644
--- a/src/dviced/Makefile.in
+++ b/src/dviced/Makefile.in
@@ -44,9 +44,11 @@ SDBGOBJS = state_analyzer.o \
 	   $(top_builddir)/src/opr/liboafs_opr.la
 
 LIBS=${TOP_LIBDIR}/libafsauthent.a \
-     ${TOP_LIBDIR}/libafsrpc.a \
-     $(top_builddir)/src/fsint/liboafs_fsint.la \
+     $(top_builddir)/src/sys/liboafs_sys.la \
+     $(top_builddir)/src/rxkad/liboafs_rxkad.la \
+     $(top_builddir)/src/rxstat/liboafs_rxstat.la \
      $(top_builddir)/src/lwp/liboafs_lwpcompat.la \
+     $(top_builddir)/src/fsint/liboafs_fsint.la \
      $(top_builddir)/src/cmd/liboafs_cmd.la \
      $(top_builddir)/src/opr/liboafs_opr.la \
      $(top_builddir)/src/util/liboafs_util.la
diff --git a/src/dvolser/Makefile.in b/src/dvolser/Makefile.in
index 7d52a319ac..3369549bd3 100644
--- a/src/dvolser/Makefile.in
+++ b/src/dvolser/Makefile.in
@@ -36,8 +36,11 @@ objects= ${VOLSEROBJS} ${LIBACLOBJS} \
 
 LIBS=	$(top_builddir)/src/cmd/liboafs_cmd.la		\
 	${TOP_LIBDIR}/libafsauthent.a   \
-	${TOP_LIBDIR}/libafsrpc.a       \
-	$(top_builddir)/src/lwp/liboafs_lwpcompat.la    \
+	$(top_builddir)/src/sys/liboafs_sys.la \
+        $(top_builddir)/src/rx/liboafs_rx.la \
+        $(top_builddir)/src/rxstat/liboafs_rxstat.la \
+        $(top_builddir)/src/rxkad/liboafs_rxkad.la \
+        $(top_builddir)/src/lwp/liboafs_lwpcompat.la \
 	$(top_builddir)/src/util/liboafs_util.la	\
 	$(top_builddir)/src/opr/liboafs_opr.la		\
 	$(top_builddir)/src/usd/liboafs_usd.la
diff --git a/src/sys/Makefile.in b/src/sys/Makefile.in
index 05cef0ca60..267a0e7e1e 100644
--- a/src/sys/Makefile.in
+++ b/src/sys/Makefile.in
@@ -93,7 +93,7 @@ depinstall: \
 	${UKERNELDIR}/afs/afsl.exp \
 	Krmtsys.cs.c Krmtsys.h Krmtsys.xdr.c rmtsys.h
 
-libsys.a: $(LT_objs) afsl.exp
+libsys.a: $(LT_objs) afsl.exp syscall.lo
 	@set -e; set -x; case "$(SYS_NAME)" in \
 	rs_aix*) \
 	    $(LT_LDLIB_lwp) $(LT_objs) syscall.o afsl.exp ;; \
@@ -106,7 +106,8 @@ libsys.a: $(LT_objs) afsl.exp
 liboafs_sys.la: liboafs_sys.la.sym $(LT_objs) $(LT_deps) afsl.exp
 	@set -e; set -x; case "$(SYS_NAME)" in \
 	rs_aix*) \
-	    $(LT_LDLIB_shlib) -Wl,-bI:afsl.exp $(LT_objs) $(LT_deps) ;; \
+	    $(LT_LDLIB_shlib) -Wl,-bI:afsl.exp $(LT_objs) $(LT_deps) ;\
+	    $(AR) crv .libs/liboafs_sys.a ../sys/afsl.exp ;; \
 	*) \
 	    $(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) ;; \
 	esac
diff --git a/src/tbudb/Makefile.in b/src/tbudb/Makefile.in
index 6abbb26a3a..09f1118c4d 100644
--- a/src/tbudb/Makefile.in
+++ b/src/tbudb/Makefile.in
@@ -35,7 +35,9 @@ LIBS= \
 	${TOP_LIBDIR}/libbubasics.a \
 	${TOP_LIBDIR}/libubik_pthread.a \
 	${TOP_LIBDIR}/libafsauthent.a \
-	${TOP_LIBDIR}/libafsrpc.a \
+	$(top_builddir)/src/sys/liboafs_sys.la \
+	$(top_builddir)/src/rxkad/liboafs_rxkad.la \
+	$(top_builddir)/src/lwp/liboafs_lwpcompat.la \
 	$(top_builddir)/src/cmd/liboafs_cmd.la \
 	$(top_builddir)/src/opr/liboafs_opr.la \
 	$(top_builddir)/src/util/liboafs_util.la
diff --git a/src/tbutc/Makefile.in b/src/tbutc/Makefile.in
index 4f7bfa1366..ff667d77be 100644
--- a/src/tbutc/Makefile.in
+++ b/src/tbutc/Makefile.in
@@ -51,12 +51,13 @@ BUTCLIBS=${TOP_LIBDIR}/libbudb.a \
 	    ${VOLSERLIBS} \
             ${BUTMLIBS} \
 	    ${TOP_LIBDIR}/libafsauthent.a \
-	    ${TOP_LIBDIR}/libafsrpc.a \
+	    $(top_builddir)/src/rxkad/liboafs_rxkad.la \
             $(top_builddir)/src/cmd/liboafs_cmd.la \
 	    $(top_builddir)/src/util/liboafs_util.la \
 	    $(top_builddir)/src/opr/liboafs_opr.la \
 	    $(top_builddir)/src/usd/liboafs_usd.la \
 	    $(top_builddir)/src/lwp/liboafs_lwpcompat.la \
+	    $(top_builddir)/src/sys/liboafs_sys.la \
 	    ${TOP_LIBDIR}/libprocmgmt.a
 
 #
diff --git a/src/tptserver/Makefile.in b/src/tptserver/Makefile.in
index 639817ecb0..1cede513dd 100644
--- a/src/tptserver/Makefile.in
+++ b/src/tptserver/Makefile.in
@@ -30,7 +30,11 @@ INCLS=${TOP_INCDIR}/ubik.h \
 LIBS_common= \
 	${TOP_LIBDIR}/libubik_pthread.a \
 	${TOP_LIBDIR}/libafsauthent.a \
-	${TOP_LIBDIR}/libafsrpc.a \
+	$(top_builddir)/src/sys/liboafs_sys.la \
+	$(top_builddir)/src/rx/liboafs_rx.la \
+	$(top_builddir)/src/rxstat/liboafs_rxstat.la \
+	$(top_builddir)/src/lwp/liboafs_lwpcompat.la \
+	$(top_builddir)/src/rxkad/liboafs_rxkad.la \
 	$(top_builddir)/src/cmd/liboafs_cmd.la \
 	$(top_builddir)/src/util/liboafs_util.la \
 	$(top_builddir)/src/opr/liboafs_opr.la
diff --git a/src/tsalvaged/Makefile.in b/src/tsalvaged/Makefile.in
index 6ba6e4d566..c6ff2396ae 100644
--- a/src/tsalvaged/Makefile.in
+++ b/src/tsalvaged/Makefile.in
@@ -45,7 +45,7 @@ FSSDEBUG_OBJS = fssync-debug.o physio.o common.o ${VLIBOBJS} ${DIROBJS}
 SSSDEBUG_OBJS = salvsync-debug.o physio.o common.o ${VLIBOBJS} ${DIROBJS}
 
 LIBS=   ${TOP_LIBDIR}/libafsauthent.a \
-	${TOP_LIBDIR}/libafsrpc.a \
+	$(top_builddir)/src/rx/liboafs_rx.la \
 	$(top_builddir)/src/util/liboafs_util.la \
 	$(top_builddir)/src/cmd/liboafs_cmd.la \
 	$(top_builddir)/src/lwp/liboafs_lwpcompat.la \
diff --git a/src/tubik/Makefile.in b/src/tubik/Makefile.in
index 9d30c69d68..b9641ce211 100644
--- a/src/tubik/Makefile.in
+++ b/src/tubik/Makefile.in
@@ -23,10 +23,11 @@ INCLS=${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/lock.h \
 	${TOP_INCDIR}/lock.h ubik.h ubik_int.h utst_int.h
 
 
-LIBS=${TOP_LIBDIR}/libafsauthent.a ${TOP_LIBDIR}/libafsrpc.a \
+LIBS=${TOP_LIBDIR}/libafsauthent.a \
+     $(top_builddir)/src/lwp/liboafs_lwpcompat.la \
      $(top_builddir)/src/comerr/liboafs_comerr.la \
      ${top_builddir}/src/cmd/liboafs_cmd.la \
-     ${TOP_LIBDIR}/libsys.a \
+     $(top_builddir)/src/sys/liboafs_sys.la \
      $(top_builddir)/src/util/liboafs_util.la \
      $(top_builddir)/src/opr/liboafs_opr.la \
      ${XLIBS} ${MT_LIBS}
diff --git a/src/tvlserver/Makefile.in b/src/tvlserver/Makefile.in
index 3964072431..d8fbf8fa14 100644
--- a/src/tvlserver/Makefile.in
+++ b/src/tvlserver/Makefile.in
@@ -26,8 +26,12 @@ INCLS=${TOP_INCDIR}/ubik.h \
 LIBS_common = \
 	${TOP_LIBDIR}/libubik_pthread.a \
 	${TOP_LIBDIR}/libafsauthent.a \
+	$(top_builddir)/src/sys/liboafs_sys.la \
+	$(top_builddir)/src/rx/liboafs_rx.la \
+	$(top_builddir)/src/rxstat/liboafs_rxstat.la \
+	$(top_builddir)/src/rxkad/liboafs_rxkad.la \
+	$(top_builddir)/src/lwp/liboafs_lwpcompat.la \
 	$(top_builddir)/src/cmd/liboafs_cmd.la \
-	${TOP_LIBDIR}/libafsrpc.a \
 	$(top_builddir)/src/util/liboafs_util.la \
 	${TOP_LIBDIR}/libaudit.a \
 	$(top_builddir)/src/opr/liboafs_opr.la
diff --git a/src/tvolser/Makefile.in b/src/tvolser/Makefile.in
index a642146f78..8e2c4b42aa 100644
--- a/src/tvolser/Makefile.in
+++ b/src/tvolser/Makefile.in
@@ -41,11 +41,15 @@ vosobjects= ${VOSOBJS} ${VLSERVEROBJS} ${LIBACLOBJS} ${DIROBJS} \
 	${VOLOBJS}
 
 LIBS_common = \
+	$(top_builddir)/src/sys/liboafs_sys.la \
 	$(top_builddir)/src/cmd/liboafs_cmd.la \
 	${TOP_LIBDIR}/libafsauthent.a   \
 	$(top_builddir)/src/util/liboafs_util.la      \
 	$(top_builddir)/src/usd/liboafs_usd.la		\
-	${TOP_LIBDIR}/libafsrpc.a	\
+	$(top_builddir)/src/rx/liboafs_rx.la \
+	$(top_builddir)/src/rxstat/liboafs_rxstat.la \
+	$(top_builddir)/src/rxkad/liboafs_rxkad.la \
+	$(top_builddir)/src/lwp/liboafs_lwpcompat.la \
 	$(top_builddir)/src/opr/liboafs_opr.la
 
 LIBS_client = \
diff --git a/src/venus/Makefile.in b/src/venus/Makefile.in
index 3a2560d581..fc60ccbe23 100644
--- a/src/venus/Makefile.in
+++ b/src/venus/Makefile.in
@@ -26,7 +26,8 @@ AFSIO_INCLS=${TOP_INCDIR}/afs/afsint.h \
 
 AFSIO_LIBS=${TOP_LIBDIR}/libafscp.a \
 	${TOP_LIBDIR}/libafsauthent.a \
-	${TOP_LIBDIR}/libafsrpc.a \
+	$(top_builddir)/src/rxkad/liboafs_rxkad.la \
+	$(top_builddir)/src/fsint/liboafs_fsint.la \
 	$(top_builddir)/src/cmd/liboafs_cmd.la \
 	$(top_builddir)/src/util/liboafs_util.la \
 	$(top_builddir)/src/opr/liboafs_opr.la
diff --git a/src/viced/Makefile.in b/src/viced/Makefile.in
index 76bc19e1c2..d4cee44b11 100644
--- a/src/viced/Makefile.in
+++ b/src/viced/Makefile.in
@@ -38,7 +38,10 @@ objects= ${VICEDOBJS} ${VLSERVEROBJS} ${LWPOBJS} ${LIBACLOBJS} \
 	 ${DIROBJS} ${VOLOBJS} ${FSINTOBJS}
 
 LIBS=${TOP_LIBDIR}/libafsauthent.a \
-     ${TOP_LIBDIR}/libafsrpc.a \
+     $(top_builddir)/src/sys/liboafs_sys.la \
+     $(top_builddir)/src/rxkad/liboafs_rxkad.la \
+     $(top_builddir)/src/rxstat/liboafs_rxstat.la \
+     $(top_builddir)/src/lwp/liboafs_lwpcompat.la \
      $(top_builddir)/src/fsint/liboafs_fsint.la \
      $(top_builddir)/src/cmd/liboafs_cmd.la \
      $(top_builddir)/src/opr/liboafs_opr.la \