diff --git a/Makefile.am b/Makefile.am
index 5e8899eb9..d0b706f34 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,3 +2,5 @@
 
 AUTOMAKE_OPTIONS = foreign no-dependencies
 SUBDIRS	= include lib kuser kdc admin kadmin kpasswd appl doc
+
+ACLOCAL = @ACLOCAL@ --acdir=$(srcdir)/cf
diff --git a/admin/Makefile.am b/admin/Makefile.am
index 871f9147e..471b8bb21 100644
--- a/admin/Makefile.am
+++ b/admin/Makefile.am
@@ -13,9 +13,9 @@ sbin_PROGRAMS = ktutil
 ktutil_SOURCES = ktutil.c srvconvert.c
 
 LDADD = \
-	$(top_builddir)/lib/krb5/libkrb5.a \
-	$(top_builddir)/lib/des/libdes.a \
-	$(top_builddir)/lib/asn1/libasn1.a \
+	$(top_builddir)/lib/krb5/libkrb5.la \
+	$(top_builddir)/lib/des/libdes.la \
+	$(top_builddir)/lib/asn1/libasn1.la \
 	$(top_builddir)/lib/sl/libsl.a \
 	$(LIB_readline) \
-	$(top_builddir)/lib/roken/libroken.a
+	$(top_builddir)/lib/roken/libroken.la
diff --git a/appl/afsutil/Makefile.am b/appl/afsutil/Makefile.am
index f3f42d688..2bc446496 100644
--- a/appl/afsutil/Makefile.am
+++ b/appl/afsutil/Makefile.am
@@ -11,4 +11,9 @@ AFSPROGS =
 endif
 bin_PROGRAMS = $(AFSPROGS)
 
-LDADD = $(top_builddir)/lib/kafs/libkafs.a $(LIB_krb4) $(top_builddir)/lib/krb5/libkrb5.a $(top_builddir)/lib/asn1/libasn1.a $(top_builddir)/lib/des/libdes.a $(top_builddir)/lib/roken/libroken.a
+LDADD = $(top_builddir)/lib/kafs/libkafs.a \
+	$(LIB_krb4) \
+	$(top_builddir)/lib/krb5/libkrb5.la \
+	$(top_builddir)/lib/asn1/libasn1.la \
+	$(top_builddir)/lib/des/libdes.la \
+	$(top_builddir)/lib/roken/libroken.la
diff --git a/appl/ftp/ftp/Makefile.am b/appl/ftp/ftp/Makefile.am
index a11b67d38..628f6ff7a 100644
--- a/appl/ftp/ftp/Makefile.am
+++ b/appl/ftp/ftp/Makefile.am
@@ -30,10 +30,10 @@ EXTRA_ftp_SOURCES = krb4.c kauth.c
 
 LDADD = \
 	../common/libcommon.a \
-	$(top_builddir)/lib/gssapi/libgssapi.a \
-	$(top_builddir)/lib/krb5/libkrb5.a \
-	$(top_builddir)/lib/des/libdes.a \
-	$(top_builddir)/lib/asn1/libasn1.a \
+	$(top_builddir)/lib/gssapi/libgssapi.la \
+	$(top_builddir)/lib/krb5/libkrb5.la \
+	$(top_builddir)/lib/des/libdes.la \
+	$(top_builddir)/lib/asn1/libasn1.la \
 	$(LIB_krb4) \
-	$(top_builddir)/lib/roken/libroken.a \
+	$(top_builddir)/lib/roken/libroken.la \
 	$(LIB_readline)
diff --git a/appl/ftp/ftpd/Makefile.am b/appl/ftp/ftpd/Makefile.am
index 1490e1614..2e881fea7 100644
--- a/appl/ftp/ftpd/Makefile.am
+++ b/appl/ftp/ftpd/Makefile.am
@@ -46,12 +46,12 @@ afslib =
 endif
 
 LDADD = ../common/libcommon.a \
-	$(top_builddir)/lib/gssapi/libgssapi.a \
+	$(top_builddir)/lib/gssapi/libgssapi.la \
 	$(afslib) \
-	$(top_builddir)/lib/krb5/libkrb5.a \
-	$(top_builddir)/lib/des/libdes.a \
+	$(top_builddir)/lib/krb5/libkrb5.la \
+	$(top_builddir)/lib/des/libdes.la \
 	$(LIB_krb4) \
-	$(top_builddir)/lib/asn1/libasn1.a \
-	$(top_builddir)/lib/otp/libotp.a \
-	$(top_builddir)/lib/roken/libroken.a @LIB_crypt@ \
-	$(DBLIB)
+	$(top_builddir)/lib/asn1/libasn1.la \
+	$(top_builddir)/lib/otp/libotp.la \
+	$(top_builddir)/lib/roken/libroken.la \
+	@LIB_crypt@ $(DBLIB)
diff --git a/appl/login/Makefile.am b/appl/login/Makefile.am
index 15f9536a7..ee2d6e087 100644
--- a/appl/login/Makefile.am
+++ b/appl/login/Makefile.am
@@ -7,8 +7,8 @@ INCLUDES = -I$(top_builddir)/include $(INCLUDE_krb4)
 bin_PROGRAMS = login
 login_SOURCES = login.c read_string.c utmp_login.c utmpx_login.c tty.c stty_default.c
 
-LDADD = $(top_builddir)/lib/krb5/libkrb5.a \
-	$(top_builddir)/lib/des/libdes.a \
+LDADD = $(top_builddir)/lib/krb5/libkrb5.la \
+	$(top_builddir)/lib/des/libdes.la \
 	$(LIB_krb4) \
-	$(top_builddir)/lib/asn1/libasn1.a \
-	$(top_builddir)/lib/roken/libroken.a
+	$(top_builddir)/lib/asn1/libasn1.la \
+	$(top_builddir)/lib/roken/libroken.la
diff --git a/appl/popper/Makefile.am b/appl/popper/Makefile.am
index 52582b44e..9848d8917 100644
--- a/appl/popper/Makefile.am
+++ b/appl/popper/Makefile.am
@@ -19,4 +19,10 @@ popper_SOURCES = \
 	pop_user.c pop_uidl.c pop_xover.c popper.c \
 	maildir.c
 
-LDADD = -L$(top_builddir)/lib/krb5 -lkrb5 $(LIB_otp) -L$(top_builddir)/lib/des -ldes $(LIB_krb4) -L$(top_builddir)/lib/asn1 -lasn1 -L$(top_builddir)/lib/roken -lroken $(DBLIB)
+LDADD = $(top_builddir)/lib/krb5/libkrb5.la \
+	$(LIB_otp) \
+	$(top_builddir)/lib/des/libdes.la \
+	$(LIB_krb4) \
+	$(top_builddir)/lib/asn1/libasn1.la \
+	$(top_builddir)/lib/roken/libroken.la \
+	$(DBLIB)
diff --git a/appl/push/Makefile.am b/appl/push/Makefile.am
index a23b5b549..dd8620b71 100644
--- a/appl/push/Makefile.am
+++ b/appl/push/Makefile.am
@@ -8,4 +8,8 @@ libexec_PROGRAMS	= push
 
 push_SOURCES		= push.c
 
-LDADD = -L$(top_builddir)/lib/krb5 -lkrb5 -L$(top_builddir)/lib/des -ldes $(LIB_krb4) -L$(top_builddir)/lib/asn1 -lasn1 -L$(top_builddir)/lib/roken -lroken
+LDADD = $(top_builddir)/lib/krb5/libkrb5.la \
+	$(top_builddir)/lib/des/libdes.la \
+	$(LIB_krb4) \
+	$(top_builddir)/lib/asn1/libasn1.la \
+	$(top_builddir)/lib/roken/libroken.la
diff --git a/appl/rsh/Makefile.am b/appl/rsh/Makefile.am
index 494a0e3fb..87f4a8cb3 100644
--- a/appl/rsh/Makefile.am
+++ b/appl/rsh/Makefile.am
@@ -12,4 +12,8 @@ rsh_SOURCES  = rsh.c common.c
 
 rshd_SOURCES = rshd.c common.c
 
-LDADD = -L$(top_builddir)/lib/krb5 -lkrb5 -L$(top_builddir)/lib/des -ldes $(LIB_krb4) -L$(top_builddir)/lib/asn1 -lasn1 -L$(top_builddir)/lib/roken -lroken
+LDADD = $(top_builddir)/lib/krb5/libkrb5.la \
+	$(top_builddir)/lib/des/libdes.la \
+	$(LIB_krb4) \
+	$(top_builddir)/lib/asn1/libasn1.la \
+	$(top_builddir)/lib/roken/libroken.la
diff --git a/appl/telnet/telnet/Makefile.am b/appl/telnet/telnet/Makefile.am
index 21ab202d3..f10f41189 100644
--- a/appl/telnet/telnet/Makefile.am
+++ b/appl/telnet/telnet/Makefile.am
@@ -10,4 +10,10 @@ telnet_SOURCES  = authenc.c commands.c main.c network.c ring.c \
 		  sys_bsd.c telnet.c terminal.c \
 		  utilities.c
 
-LDADD = -L../libtelnet -ltelnet -L$(top_builddir)/lib/krb5 -lkrb5 -L$(top_builddir)/lib/des -ldes $(LIB_krb4) -L$(top_builddir)/lib/asn1 -lasn1 @LIB_tgetent@ -L$(top_builddir)/lib/roken -lroken
+LDADD = ../libtelnet/libtelnet.a \
+	$(top_builddir)/lib/krb5/libkrb5.la \
+	$(top_builddir)/lib/des/libdes.la \
+	$(LIB_krb4) \
+	$(top_builddir)/lib/asn1/libasn1.la \
+	@LIB_tgetent@ \
+	$(top_builddir)/lib/roken/libroken.la
diff --git a/appl/telnet/telnetd/Makefile.am b/appl/telnet/telnetd/Makefile.am
index dd6519009..4f17621bd 100644
--- a/appl/telnet/telnetd/Makefile.am
+++ b/appl/telnet/telnetd/Makefile.am
@@ -11,10 +11,10 @@ telnetd_SOURCES  = telnetd.c state.c termstat.c slc.c sys_term.c \
 
 LDADD = \
 	../libtelnet/libtelnet.a \
-	$(top_builddir)/lib/krb5/libkrb5.a \
-	$(top_builddir)/lib/des/libdes.a \
+	$(top_builddir)/lib/krb5/libkrb5.la \
+	$(top_builddir)/lib/des/libdes.la \
 	$(LIB_krb4) \
-	$(top_builddir)/lib/asn1/libasn1.a \
+	$(top_builddir)/lib/asn1/libasn1.la \
 	@LIB_tgetent@ \
 	@LIB_logwtmp@ \
-	$(top_builddir)/lib/roken/libroken.a
+	$(top_builddir)/lib/roken/libroken.la
diff --git a/appl/test/Makefile.am b/appl/test/Makefile.am
index 349a1cd33..883885df9 100644
--- a/appl/test/Makefile.am
+++ b/appl/test/Makefile.am
@@ -19,8 +19,11 @@ uu_server_SOURCES = uu_server.c common.c
 
 uu_client_SOURCES = uu_client.c common.c
 
-gssapi_server_LDADD = -L$(top_builddir)/lib/gssapi -lgssapi $(LDADD)
+gssapi_server_LDADD = $(top_builddir)/lib/gssapi/libgssapi.a $(LDADD)
 
-gssapi_client_LDADD = -L$(top_builddir)/lib/gssapi -lgssapi $(LDADD)
+gssapi_client_LDADD = $(top_builddir)/lib/gssapi/libgssapi.a $(LDADD)
 
-LDADD = -L$(top_builddir)/lib/krb5 -lkrb5 -L$(top_builddir)/lib/des -ldes -L$(top_builddir)/lib/asn1 -lasn1 -L$(top_builddir)/lib/roken -lroken
+LDADD = $(top_builddir)/lib/krb5/libkrb5.la \
+	$(top_builddir)/lib/des/libdes.la \
+	$(top_builddir)/lib/asn1/libasn1.la \
+	$(top_builddir)/lib/roken/libroken.la
diff --git a/appl/xnlock/Makefile.am b/appl/xnlock/Makefile.am
index 41e6a81dd..e948ff71d 100644
--- a/appl/xnlock/Makefile.am
+++ b/appl/xnlock/Makefile.am
@@ -9,9 +9,16 @@ INCLUDES = -I$(top_builddir)/include $(INCLUDE_krb4) $(X_CFLAGS) -DBINDIR=\"$(bi
 
 bin_PROGRAMS = xnlock
 if KRB4
-AFSLIB=$(top_builddir)/lib/kafs/libkafs.a $(LIB_krb4)
+AFSLIB=$(top_builddir)/lib/kafs/libkafs.a 
 else
 AFSLIB=
 endif
 
-LDADD = $(AFSLIB) $(top_builddir)/lib/krb5/libkrb5.a $(top_builddir)/lib/asn1/libasn1.a $(top_builddir)/lib/des/libdes.a $(top_builddir)/lib/roken/libroken.a $(XLIBS)
+LDADD = \
+	$(top_builddir)/lib/kafs/libkafs.a \
+	$(LIB_krb4) \
+	$(top_builddir)/lib/krb5/libkrb5.la \
+	$(top_builddir)/lib/asn1/libasn1.la \
+	$(top_builddir)/lib/des/libdes.la \
+	$(top_builddir)/lib/roken/libroken.la \
+	$(XLIBS)
diff --git a/configure.in b/configure.in
index 54bfab58d..e7dfad666 100644
--- a/configure.in
+++ b/configure.in
@@ -29,6 +29,8 @@ AM_PROG_LEX
 AC_PROG_RANLIB
 AC_PROG_AWK
 AC_KRB_PROG_LN_S
+AM_DISABLE_SHARED
+AM_PROG_LIBTOOL
 
 if test "$GCC" = "yes"; then
 # -Wcast-align doesn't work well on alpha osf/1
@@ -91,7 +93,7 @@ fi
 ])
 if test "$otp" = "yes"; then
 	AC_DEFINE(OTP)
-	LIB_otp='-L$(top_builddir)/lib/otp -lotp'
+	LIB_otp='$(top_builddir)/lib/otp/libotp.a'
 	OTP_dir=otp
 fi
 AC_SUBST(LIB_otp)
@@ -491,8 +493,6 @@ dnl
 AC_KRB_STRUCT_SOCKADDR_SA_LEN
 
 
-dnl AC_SUBST(LIBOBJS)
-
 AC_GROK_TYPES(int8_t int16_t int32_t int64_t)
 AC_GROK_TYPES(u_int8_t u_int16_t u_int32_t u_int64_t)
 
@@ -512,7 +512,7 @@ elif test "$ac_cv_func_el_init" = yes; then
 	AC_DEFINE(HAVE_READLINE, 1)
 
 	editline_OBJS=edit_compat.o
-	LIB_readline='-L$(top_builddir)/lib/editline -leditline '"$LIB_el_init"' $(LIB_tgetent)'
+	LIB_readline='$(top_builddir)/lib/editline/libeditline.a '"$LIB_el_init"' $(LIB_tgetent)'
 
 	INCLUDE_readline='-I$(top_builddir)/lib/editline -I$(top_srcdir)/lib/editline'
 elif test "$ac_cv_func_readline" = yes; then
@@ -523,7 +523,7 @@ elif test "$ac_cv_func_readline" = yes; then
 else
 	AC_DEFINE(HAVE_READLINE, 1)
 	editline_OBJS="editline.o complete.o sysunix.o"
-	LIB_readline='-L$(top_builddir)/lib/editline -leditline $(LIB_tgetent)'
+	LIB_readline='$(top_builddir)/lib/editline/libeditline.a $(LIB_tgetent)'
 	INCLUDE_readline='-I$(top_builddir)/lib/editline -I$(top_srcdir)/lib/editline'
 fi
 AC_SUBST(LIB_tgetent)
@@ -585,6 +585,12 @@ for i in bin lib libexec sbin; do
 	AC_DEFINE_UNQUOTED($foo,"$x")
 done
 
+if false; then
+	# hack to shut up automake
+	LIBOBJS="$LIBOBJS make-print-version.o"
+fi
+LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/\.lo/g'`
+AC_SUBST(LTLIBOBJS)
 AC_OUTPUT(Makefile 			\
 	include/Makefile		\
 	include/kadm5/Makefile		\
diff --git a/kadmin/Makefile.am b/kadmin/Makefile.am
index 1733f2014..e17f0e35e 100644
--- a/kadmin/Makefile.am
+++ b/kadmin/Makefile.am
@@ -13,13 +13,13 @@ kadmin_SOURCES = 						\
 	load.c mod.c rename.c util.c
 
 COMMON_LDADD = \
-	$(top_builddir)/lib/hdb/libhdb.a \
-	$(top_builddir)/lib/krb5/libkrb5.a \
-	$(top_builddir)/lib/des/libdes.a \
-	$(top_builddir)/lib/asn1/libasn1.a \
+	$(top_builddir)/lib/hdb/libhdb.la \
+	$(top_builddir)/lib/krb5/libkrb5.la \
+	$(top_builddir)/lib/des/libdes.la \
+	$(top_builddir)/lib/asn1/libasn1.la \
 	$(top_builddir)/lib/sl/libsl.a \
 	$(LIB_readline) \
-	$(top_builddir)/lib/roken/libroken.a \
+	$(top_builddir)/lib/roken/libroken.la \
 	$(DBLIB)
 
 kadmind_LDADD = $(top_builddir)/lib/kadm5/libkadm5srv.a $(COMMON_LDADD)
diff --git a/kdc/Makefile.am b/kdc/Makefile.am
index 1a9e24da3..881e4219e 100644
--- a/kdc/Makefile.am
+++ b/kdc/Makefile.am
@@ -18,22 +18,23 @@ hpropd_SOURCES = hpropd.c hprop-common.c
 kdc_SOURCES = 524.c connect.c config.c kerberos4.c kerberos5.c log.c main.c misc.c kaserver.c
 
 if KRB4
-hprop_LDADD = ../lib/hdb/libhdb.a \
-	../lib/krb5/libkrb5.a \
-	../lib/des/libdes.a \
-	../lib/asn1/libasn1.a \
+hprop_LDADD = \
+	$(top_builddir)/lib/hdb/libhdb.la \
+	$(top_builddir)/lib/krb5/libkrb5.la \
+	$(top_builddir)/lib/des/libdes.la \
+	$(top_builddir)/lib/asn1/libasn1.la \
 	$(LIB_krb4) -lkdb $(LIB_krb4) \
-	../lib/roken/libroken.a \
+	$(top_builddir)/lib/roken/libroken.la \
 	$(DBLIB) 
 else
 hprop_LDADD = $(LDADD)
 endif
 
-LDADD = ../lib/hdb/libhdb.a \
-	../lib/krb5/libkrb5.a \
-	../lib/des/libdes.a \
-	../lib/asn1/libasn1.a \
+LDADD = $(top_builddir)/lib/hdb/libhdb.la \
+	$(top_builddir)/lib/krb5/libkrb5.la \
+	$(top_builddir)/lib/des/libdes.la \
+	$(top_builddir)/lib/asn1/libasn1.la \
 	$(LIB_krb4) \
-	../lib/roken/libroken.a \
+	$(top_builddir)/lib/roken/libroken.la \
 	$(DBLIB)
 
diff --git a/kpasswd/Makefile.am b/kpasswd/Makefile.am
index 2a20284a8..821de0895 100644
--- a/kpasswd/Makefile.am
+++ b/kpasswd/Makefile.am
@@ -11,12 +11,12 @@ bin_PROGRAMS = kpasswd
 libexec_PROGRAMS = kpasswdd
 
 kpasswdd_LDADD = \
-	$(top_builddir)/lib/kadm5/libkadm5srv.a \
-	$(top_builddir)/lib/hdb/libhdb.a \
+	$(top_builddir)/lib/kadm5/libkadm5srv.la \
+	$(top_builddir)/lib/hdb/libhdb.la \
 	$(LDADD) \
 	$(DBLIB)
 
-LDADD = $(top_builddir)/lib/krb5/libkrb5.a \
-	$(top_builddir)/lib/des/libdes.a \
-	$(top_builddir)/lib/asn1/libasn1.a \
-	$(top_builddir)/lib/roken/libroken.a
+LDADD = $(top_builddir)/lib/krb5/libkrb5.la \
+	$(top_builddir)/lib/des/libdes.la \
+	$(top_builddir)/lib/asn1/libasn1.la \
+	$(top_builddir)/lib/roken/libroken.la
diff --git a/kuser/Makefile.am b/kuser/Makefile.am
index c7960ec4b..719e94003 100644
--- a/kuser/Makefile.am
+++ b/kuser/Makefile.am
@@ -10,5 +10,8 @@ bin_PROGRAMS = kinit klist kdestroy
 
 noinst_PROGRAMS = kfoo krenew kverify
 
-LDADD = ../lib/krb5/libkrb5.a ../lib/asn1/libasn1.a \
-	../lib/des/libdes.a ../lib/roken/libroken.a 
+LDADD = \
+	$(top_builddir)/lib/krb5/libkrb5.la \
+	$(top_builddir)/lib/asn1/libasn1.la \
+	$(top_builddir)/lib/des/libdes.la \
+	$(top_builddir)/lib/roken/libroken.la
diff --git a/lib/asn1/Makefile.am b/lib/asn1/Makefile.am
index e48783e5e..660069b0c 100644
--- a/lib/asn1/Makefile.am
+++ b/lib/asn1/Makefile.am
@@ -8,7 +8,8 @@ CFLAGS=$(WFLAGS) @CFLAGS@
 YFLAGS = -d
 #YACCFLAGS = $(YFLAGS)
 
-lib_LIBRARIES = libasn1.a
+#lib_LIBRARIES = libasn1.a
+lib_LTLIBRARIES = libasn1.la
 
 COMPILE_ET = ../com_err/compile_et
 
@@ -115,7 +116,7 @@ asn1_compile_SOURCES = parse.y lex.l main.c hash.c symbol.c gen.c \
 	gen_encode.c gen_decode.c gen_free.c gen_length.c gen_copy.c \
 	gen_glue.c
 
-libasn1_a_SOURCES = \
+libasn1_la_SOURCES = \
 	der_get.c \
 	der_put.c \
 	der_free.c \
@@ -124,7 +125,7 @@ libasn1_a_SOURCES = \
 	timegm.c \
 	$(BUILT_SOURCES)
 
-asn1_compile_LDADD = -L../roken -lroken @LEXLIB@
+asn1_compile_LDADD = ../roken/libroken.a @LEXLIB@
 
 CLEANFILES = lex.c parse.c parse.h asn1.h $(BUILT_SOURCES) $(foo) asn1_files
 
diff --git a/lib/com_err/Makefile.am b/lib/com_err/Makefile.am
index 7f410ca7f..db48caf43 100644
--- a/lib/com_err/Makefile.am
+++ b/lib/com_err/Makefile.am
@@ -6,16 +6,16 @@ YFLAGS = -d
 
 INCLUDES = -I$(top_builddir)/include -I$(srcdir)
 
-lib_LIBRARIES = libcom_err.a
+lib_LTLIBRARIES = libcom_err.la
 
 bin_PROGRAMS = compile_et
 
 compile_et_SOURCES = compile_et.c parse.y lex.l
 
-libcom_err_a_SOURCES = error.c com_err.c
+libcom_err_la_SOURCES = error.c com_err.c
 
 CLEANFILES = lex.c parse.c parse.h
 
 $(compile_et_OBJECTS): parse.h
 
-compile_et_LDADD = -L../roken -lroken @LEXLIB@
+compile_et_LDADD = ../roken/libroken.la @LEXLIB@
diff --git a/lib/des/Makefile.am b/lib/des/Makefile.am
index a957736a5..fffac911e 100644
--- a/lib/des/Makefile.am
+++ b/lib/des/Makefile.am
@@ -4,16 +4,17 @@ AUTOMAKE_OPTIONS = no-dependencies foreign
 
 INCLUDES = -I$(top_builddir)/include
 
-lib_LIBRARIES = libdes.a
+#lib_LIBRARIES = libdes.a
+lib_LTLIBRARIES = libdes.la
 include_HEADERS = des.h
 
 noinst_PROGRAMS = destest mdtest
 
 bin_PROGRAMS = des rpw speed
 
-LDADD = $(lib_LIBRARIES)
+LDADD = $(lib_LTLIBRARIES)
 
-libdes_a_SOURCES = \
+libdes_la_SOURCES = \
 	cbc3_enc.c cbc_cksm.c cbc_enc.c \
 	cfb64ede.c cfb64enc.c cfb_enc.c des_enc.c \
 	ecb3_enc.c ecb_enc.c ede_enc.c enc_read.c \
diff --git a/lib/gssapi/Makefile.am b/lib/gssapi/Makefile.am
index 1e0a1136d..3785b8c71 100644
--- a/lib/gssapi/Makefile.am
+++ b/lib/gssapi/Makefile.am
@@ -6,9 +6,9 @@ CFLAGS = @CFLAGS@ $(WFLAGS)
 
 INCLUDES = -I$(top_builddir)/include -I$(srcdir)/../krb5
 
-lib_LIBRARIES = libgssapi.a
+lib_LTLIBRARIES = libgssapi.la
 
-libgssapi_a_SOURCES =				\
+libgssapi_la_SOURCES =				\
 	8003.c					\
 	accept_sec_context.c			\
 	acquire_cred.c				\
diff --git a/lib/gssapi/krb5/Makefile.am b/lib/gssapi/krb5/Makefile.am
index 1e0a1136d..3785b8c71 100644
--- a/lib/gssapi/krb5/Makefile.am
+++ b/lib/gssapi/krb5/Makefile.am
@@ -6,9 +6,9 @@ CFLAGS = @CFLAGS@ $(WFLAGS)
 
 INCLUDES = -I$(top_builddir)/include -I$(srcdir)/../krb5
 
-lib_LIBRARIES = libgssapi.a
+lib_LTLIBRARIES = libgssapi.la
 
-libgssapi_a_SOURCES =				\
+libgssapi_la_SOURCES =				\
 	8003.c					\
 	accept_sec_context.c			\
 	acquire_cred.c				\
diff --git a/lib/hdb/Makefile.am b/lib/hdb/Makefile.am
index 98e5c83d2..20ac5ff6b 100644
--- a/lib/hdb/Makefile.am
+++ b/lib/hdb/Makefile.am
@@ -15,15 +15,15 @@ foo = asn1_Key.x asn1_Event.x asn1_HDBFlags.x asn1_hdb_entry.x asn1_Salt.x
 
 CLEANFILES = $(BUILT_SOURCES) $(foo) hdb_asn1.h asn1_files
 
-lib_LIBRARIES = libhdb.a
+lib_LTLIBRARIES = libhdb.la
 
-libhdb_a_SOURCES = hdb.c common.c db.c ndbm.c $(BUILT_SOURCES)
+libhdb_la_SOURCES = hdb.c common.c db.c ndbm.c $(BUILT_SOURCES)
 
 include_HEADERS = hdb.h
 incdir = $(includedir)
 inc_DATA = hdb_err.h hdb_asn1.h
 
-libhdb_a_LIBADD = 
+libhdb_la_LIBADD = 
 
 idir = $(top_builddir)/include
 
diff --git a/lib/kadm5/Makefile.am b/lib/kadm5/Makefile.am
index cbd2ed2de..480900907 100644
--- a/lib/kadm5/Makefile.am
+++ b/lib/kadm5/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES = $(WFLAGS)
 
 COMPILE_ET = ../com_err/compile_et
 
-lib_LIBRARIES = libkadm5srv.a libkadm5clnt.a
+lib_LTLIBRARIES = libkadm5srv.la libkadm5clnt.la
 sbin_PROGRAMS = dump_log replay_log
 
 libexec_PROGRAMS = ipropd-master ipropd-slave
@@ -54,8 +54,8 @@ COMMON_SOURCES =				\
 	set_keys.c				\
 	set_modifier.c
 	
-libkadm5srv_a_SOURCES = $(COMMON_SOURCES) server_glue.c
-libkadm5clnt_a_SOURCES = $(COMMON_SOURCES) client_glue.c
+libkadm5srv_la_SOURCES = $(COMMON_SOURCES) server_glue.c
+libkadm5clnt_la_SOURCES = $(COMMON_SOURCES) client_glue.c
 
 dump_log_SOURCES = dump_log.c
 
@@ -66,12 +66,12 @@ ipropd_master_SOURCES = ipropd_master.c
 ipropd_slave_SOURCES = ipropd_slave.c
 
 LDADD = \
-	libkadm5srv.a \
-	$(top_builddir)/lib/hdb/libhdb.a \
-	$(top_builddir)/lib/krb5/libkrb5.a \
-	$(top_builddir)/lib/asn1/libasn1.a \
-	$(top_builddir)/lib/des/libdes.a \
-	$(top_builddir)/lib/roken/libroken.a \
+	libkadm5srv.la \
+	$(top_builddir)/lib/hdb/libhdb.la \
+	$(top_builddir)/lib/krb5/libkrb5.la \
+	$(top_builddir)/lib/asn1/libasn1.la \
+	$(top_builddir)/lib/des/libdes.la \
+	$(top_builddir)/lib/roken/libroken.la \
 	$(DBLIB)
 
 CLEANFILES = kadm5_err.c kadm5_err.h
diff --git a/lib/krb5/Makefile.am b/lib/krb5/Makefile.am
index 82c26485a..072a04e16 100644
--- a/lib/krb5/Makefile.am
+++ b/lib/krb5/Makefile.am
@@ -8,13 +8,13 @@ CFLAGS=$(WFLAGS) @CFLAGS@
 
 COMPILE_ET = ../com_err/compile_et
 
-lib_LIBRARIES = libkrb5.a
+lib_LTLIBRARIES = libkrb5.la
 
 SUFFIXES = .et .h
 
 ERR_FILES = krb5_err.c heim_err.c
 
-libkrb5_a_SOURCES = \
+libkrb5_la_SOURCES = \
 	addr_families.c \
 	address.c \
 	asn1_glue.c \
@@ -105,7 +105,7 @@ $(srcdir)/krb5-protos.h:
 
 INCLUDES = $(INCLUDE_krb4)
 
-libkrb5_a_LIBADD = ../com_err/error.o ../com_err/com_err.o
+libkrb5_la_LIBADD = ../com_err/error.lo ../com_err/com_err.lo
 
 man_MANS = krb5.conf.5 krb5_warn.3 krb5_openlog.3 \
 	krb5_425_conv_principal.3 krb5_build_principal.3 krb5_free_principal.3 \
diff --git a/lib/otp/Makefile.am b/lib/otp/Makefile.am
index d931e5b50..207225540 100644
--- a/lib/otp/Makefile.am
+++ b/lib/otp/Makefile.am
@@ -6,11 +6,11 @@ INCLUDES = -I$(top_builddir)/include
 
 noinst_PROGRAMS = otptest
 
-otptest_LDADD = libotp.a -L$(top_builddir)/lib/des -ldes -L$(top_builddir)/lib/roken -lroken
+otptest_LDADD = libotp.a $(top_builddir)/lib/des/libdes.la $(top_builddir)/lib/roken/libroken.la
 
-lib_LIBRARIES = libotp.a
+lib_LTLIBRARIES = libotp.la
 
-libotp_a_SOURCES = \
+libotp_la_SOURCES = \
 	otp.c \
 	otp_challenge.c \
 	otp_db.c \
diff --git a/lib/roken/Makefile.am b/lib/roken/Makefile.am
index 844b1c773..de1e57038 100644
--- a/lib/roken/Makefile.am
+++ b/lib/roken/Makefile.am
@@ -6,13 +6,13 @@ INCLUDES = -I$(top_builddir)/include
 
 CLEANFILES = roken.h make-roken.c print_version.h
 
-lib_LIBRARIES = libroken.a
+lib_LTLIBRARIES = libroken.la
 
 noinst_PROGRAMS = make-roken make-print-version
 
 make_print_version_LDADD = $(LIB_krb4)
 
-libroken_a_SOURCES =				\
+libroken_la_SOURCES =				\
 	base64.c				\
 	concat.c				\
 	get_window_size.c			\
@@ -32,7 +32,7 @@ libroken_a_SOURCES =				\
 	verify.c				\
 	warnerr.c
 
-libroken_a_LIBADD = @LIBOBJS@
+libroken_la_LIBADD = @LTLIBOBJS@
 
 $(LIBOBJS) $(libroken_a_OBJECTS): roken.h
 
diff --git a/lib/sl/Makefile.am b/lib/sl/Makefile.am
index ec9a0d30a..db4fe8a8a 100644
--- a/lib/sl/Makefile.am
+++ b/lib/sl/Makefile.am
@@ -19,4 +19,4 @@ mk_cmds_SOURCES = make_cmds.c parse.y lex.l
 
 $(mk_cmds_OBJECTS): parse.h
 
-LDADD = -L../roken -lroken @LEXLIB@
+LDADD = ../roken/libroken.a @LEXLIB@