diff -Nur cyrus-sasl-2.1.21.old/lib/Makefile.am cyrus-sasl-2.1.21/lib/Makefile.am
--- cyrus-sasl-2.1.21.old/lib/Makefile.am	2005-05-07 14:54:18.000000000 +1000
+++ cyrus-sasl-2.1.21/lib/Makefile.am	2006-02-13 17:17:25.000000000 +1100
@@ -62,7 +62,7 @@
 libsasl2_la_SOURCES = $(common_sources) $(common_headers)
 libsasl2_la_LDFLAGS = -version-info $(sasl_version)
 libsasl2_la_DEPENDENCIES = $(LTLIBOBJS)
-libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR)
+libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) -lcrypt
 
 if MACOSX
 framedir = /Library/Frameworks/SASL2.framework
diff -Nur cyrus-sasl-2.1.21.old/sasldb/Makefile.am cyrus-sasl-2.1.21/sasldb/Makefile.am
--- cyrus-sasl-2.1.21.old/sasldb/Makefile.am	2005-05-07 14:54:18.000000000 +1000
+++ cyrus-sasl-2.1.21/sasldb/Makefile.am	2006-02-13 17:17:13.000000000 +1100
@@ -56,7 +56,7 @@
 libsasldb_la_SOURCES = allockey.c sasldb.h
 EXTRA_libsasldb_la_SOURCES = $(extra_common_sources)
 libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND)
-libsasldb_la_LIBADD = $(SASL_DB_BACKEND) 
+libsasldb_la_LIBADD = $(SASL_DB_BACKEND) $(SASL_DB_LIB)
 
 # Prevent make dist stupidity
 libsasldb_a_SOURCES =